diff options
| -rw-r--r-- | build_config/trunk_staging.scl | 1 | ||||
| -rw-r--r-- | build_flags.scl | 5 | ||||
| -rw-r--r-- | flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto | 2 | ||||
| -rw-r--r-- | flag_values/protobuf_flags/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto (renamed from flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto) | 0 | ||||
| -rw-r--r-- | release_configs/protobuf_flags.textproto | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl index 54e6491f..ff00cbea 100644 --- a/build_config/trunk_staging.scl +++ b/build_config/trunk_staging.scl @@ -48,7 +48,6 @@ values = [ value("RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES", True), value("RELEASE_PACKAGE_LIBSQLITE3", "3440300"), value("RELEASE_PACKAGE_TZDATA_MODULE", "com.android.tzdata"), - 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"), diff --git a/build_flags.scl b/build_flags.scl index db033aa5..e58ae242 100644 --- a/build_flags.scl +++ b/build_flags.scl @@ -99,7 +99,7 @@ flags = [ # Enable protobuf version of build flag processing. # When true, the canonical source of truth for build flags is in the # protobuf version of the data. - flag("RELEASE_BUILD_FLAGS_IN_PROTOBUF", ALL, False, origin="aosp"), + flag("RELEASE_BUILD_FLAGS_IN_PROTOBUF", ALL, True, origin="aosp"), # If true, then crashrecovery module is enabled as an apex flag("RELEASE_CRASHRECOVERY_MODULE", ALL, False), @@ -241,7 +241,8 @@ flags = [ # b/318717084 - enable the WebViewBootstrap mainline module flag("RELEASE_USE_WEBVIEW_BOOTSTRAP_MODULE", ALL, False), - # flag to enable the writing of appcompat override system properties + # flag to enable the writing of appcompat override system properties. Not expected to go + # beyond trunk flag("RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES", ALL, False, origin="aosp"), ] # Flags should be alphabetical by flag name to reduce merge conflifcts diff --git a/flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto b/flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto index b94cbc5a..b78784da 100644 --- a/flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto +++ b/flag_declarations/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto @@ -2,7 +2,7 @@ name: "RELEASE_BUILD_FLAGS_IN_PROTOBUF" namespace: "android_UNKNOWN" description: "Enable protobuf version of build flag processing. When true, the canonical source of truth for build flags is in the protobuf version of the data." value: { - bool_value: false + bool_value: true } workflow: LAUNCH containers: "product" diff --git a/flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto b/flag_values/protobuf_flags/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto index 3656a78f..3656a78f 100644 --- a/flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto +++ b/flag_values/protobuf_flags/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto diff --git a/release_configs/protobuf_flags.textproto b/release_configs/protobuf_flags.textproto deleted file mode 100644 index 032c4c42..00000000 --- a/release_configs/protobuf_flags.textproto +++ /dev/null @@ -1,2 +0,0 @@ -name: "protobuf_flags" -inherits: "trunk_staging" |