From 0258f1a870785dbf545f1b8c80f8d991d2598a01 Mon Sep 17 00:00:00 2001 From: pengxiaochuan Date: Sat, 26 Jul 2025 11:28:14 +0800 Subject: [PATCH] fix trunk.scl --- aosp/build/release/build_config/trunk.scl | 8 +++++--- .../trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 aosp/build/release/flag_values/trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto diff --git a/aosp/build/release/build_config/trunk.scl b/aosp/build/release/build_config/trunk.scl index 81881f809..082aa1129 100644 --- a/aosp/build/release/build_config/trunk.scl +++ b/aosp/build/release/build_config/trunk.scl @@ -26,7 +26,9 @@ load("//build/make/core/release_config.scl", "value") # Flags should be alphabetical by flag name to reduce merge conflifcts values = [ # keep-sorted start numeric=yes - value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk"), + value("RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION", "READ_ONLY"), + value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-ap2a"), + value("RELEASE_AIDL_USE_UNFROZEN", False), value("RELEASE_ANGLE_ON_SYSTEM", True), value("RELEASE_AVATAR_PICKER_APP", True), value("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", True), @@ -43,8 +45,8 @@ values = [ 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-06-05"), - value("RELEASE_PLATFORM_VERSION", "ZP1A"), + value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-08-05"), + value("RELEASE_PLATFORM_VERSION", "AP2A"), value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "REL"), value("RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES", "REL,VanillaIceCream"), value("RELEASE_PLATFORM_VERSION_CODENAME", "REL"), diff --git a/aosp/build/release/flag_values/trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/aosp/build/release/flag_values/trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto new file mode 100644 index 000000000..4ece17c0e --- /dev/null +++ b/aosp/build/release/flag_values/trunk/RELEASE_PLATFORM_SECURITY_PATCH.textproto @@ -0,0 +1,4 @@ +name: "RELEASE_PLATFORM_SECURITY_PATCH" +value: { + string_value: "2024-08-05" +} -- Gitee