diff options
| author | 2024-05-07 09:56:52 -0700 | |
|---|---|---|
| committer | 2024-05-08 14:57:46 -0700 | |
| commit | 6db065dc6af95ee0f33f81e6ecea437b0da73104 (patch) | |
| tree | 0be54cc80212fe328c2e1af1797303deafbf338a /build_config | |
| parent | 56fc39a0c7dbeea6cd8796261aa2fc088080df76 (diff) | |
DO NOT MERGE ANYWHERE Use protobuf for trunk_staging
This change causes trunk_staging to use the protobuf implementation of
build flagging, and makes it fail if using legacy build flag
processing.
Bug: 328495189
Test: manual, TH
Change-Id: I663a23bea7fc0af6bfb3e6e0a80c7636cfc3a2ad
Merged-In: I663a23bea7fc0af6bfb3e6e0a80c7636cfc3a2ad
Diffstat (limited to 'build_config')
| -rw-r--r-- | build_config/trunk_staging.scl | 2 | ||||
| -rw-r--r-- | build_config/trunk_staging=proto | 1 |
2 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. |