diff options
| author | 2024-05-22 16:50:18 -0700 | |
|---|---|---|
| committer | 2024-05-23 15:12:24 -0700 | |
| commit | 8047fa53dd90a2c29d6b8e5146a3d72dd065b3a8 (patch) | |
| tree | 0fec9c7b4e7cf23f835ab2fcddb533f74a78e2fe /build_config | |
| parent | 79ef9cca06f87bfd0b0e4a1cfe4bcbbbe702e808 (diff) | |
| parent | 94ae00356386ab1628d4498f9a8c8814643ad603 (diff) | |
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I6b3eb904caafa48e532b012a7f2cdc786766cdfe
Change-Id: I24f111093cda17ed5e508255868c711293dfa9a3
Diffstat (limited to 'build_config')
| -rw-r--r-- | build_config/trunk_staging.scl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl index ff00cbea..6ff3a3e8 100644 --- a/build_config/trunk_staging.scl +++ b/build_config/trunk_staging.scl @@ -28,6 +28,7 @@ fail("trunk_staging now uses protobuf") values = [ # keep-sorted start numeric=yes value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk_staging"), + value("RELEASE_AVATAR_PICKER_APP", True), value("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", True), value("RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT", True), value("RELEASE_AVF_ENABLE_DICE_CHANGES", True), @@ -42,23 +43,31 @@ values = [ value("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", True), value("RELEASE_BOARD_API_LEVEL", "202504"), value("RELEASE_BUILD_FLAGS_IN_PROTOBUF", True), + value("RELEASE_CRASHRECOVERY_MODULE", True), value("RELEASE_CREATE_ACONFIG_STORAGE_FILE", True), value("RELEASE_DEPRECATE_VNDK", True), + value("RELEASE_LARGE_SYSTEM_PROPERTY_NODE", True), value("RELEASE_NDK_ABI_MONITORED", True), + value("RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION", "2.042"), + value("RELEASE_PACKAGE_HENTAIGANA_FONT", True), value("RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES", True), value("RELEASE_PACKAGE_LIBSQLITE3", "3440300"), - value("RELEASE_PACKAGE_TZDATA_MODULE", "com.android.tzdata"), + value("RELEASE_PACKAGE_NFC_STACK", "com.android.nfcservices"), + value("RELEASE_PACKAGE_PROFILING_MODULE", True), + value("RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK", True), value("RELEASE_PACKAGE_VIRTUAL_CAMERA", "virtual_camera"), value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"), value("RELEASE_PLATFORM_SDK_VERSION", "34"), - value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-01-05"), + value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-04-05"), value("RELEASE_PLATFORM_VERSION", "ZP1A"), value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "VanillaIceCream"), value("RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES", "VanillaIceCream"), value("RELEASE_PLATFORM_VERSION_CODENAME", "VanillaIceCream"), value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"), value("RELEASE_PLATFORM_VNDK_VERSION", "35"), + value("RELEASE_REMOVE_LEGACY_EMOJI_FONT", True), value("RELEASE_SELINUX_DATA_DATA_IGNORE", True), + value("RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL", True), value("RELEASE_UNLOCKED_STORAGE_API", True), value("RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES", True), # keep-sorted end |