diff options
| -rw-r--r-- | build_config/trunk_staging.scl | 2 | ||||
| -rw-r--r-- | build_config/trunk_staging=proto | 1 | ||||
| -rw-r--r-- | flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto (renamed from flag_values/protobuf_flags/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto) | 0 |
3 files changed, 3 insertions, 0 deletions
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl index 907b84b1..dfcf02e8 100644 --- a/build_config/trunk_staging.scl +++ b/build_config/trunk_staging.scl @@ -23,6 +23,7 @@ Build flag values for release config trunk_staging. load("//build/make/core/release_config.scl", "value") +fail("trunk_staging now uses protobuf") # Flags should be alphabetical by flag name to reduce merge conflifcts values = [ # keep-sorted start numeric=yes @@ -39,6 +40,7 @@ values = [ value("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES", True), value("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", True), value("RELEASE_BOARD_API_LEVEL", "202504"), + value("RELEASE_BUILD_FLAGS_IN_PROTOBUF", True), value("RELEASE_CREATE_ACONFIG_STORAGE_FILE", True), value("RELEASE_DEPRECATE_VNDK", True), value("RELEASE_NDK_ABI_MONITORED", True), diff --git a/build_config/trunk_staging=proto b/build_config/trunk_staging=proto new file mode 100644 index 00000000..1c2c9406 --- /dev/null +++ b/build_config/trunk_staging=proto @@ -0,0 +1 @@ +Text to help presubmit know that it has work to do. diff --git a/flag_values/protobuf_flags/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto b/flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto index 3656a78f..3656a78f 100644 --- a/flag_values/protobuf_flags/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto +++ b/flag_values/trunk_staging/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto |