diff options
| author | LaMont Jones <lamontjones@google.com> | 2023-11-27 20:21:55 +0000 |
|---|---|---|
| committer | LaMont Jones <lamontjones@google.com> | 2023-11-27 20:44:04 +0000 |
| commit | d99483821a2993fab41633027f2dba490ad1021c (patch) | |
| tree | a9c90dfff349a822d05521b8007dad50d90f77d5 | |
| parent | bfb69124a0410f8e13c523f6c0292f5321ab1ece (diff) | |
| download | release-d99483821a2993fab41633027f2dba490ad1021c.tar.gz | |
trunk_food vs trunk: only aconfig flags differ
Change trunk_food.scl to be a minimal difference from trunk, with a note
saying that it should not be changed. This will keep the build flags
for trunk and trunk_food in sync.
Bug: b/313479515
Test: manual
Merged-In: Idef2c06b341a105cb95ee70fc0bc4997229bd787
Merged-In: I28092379c7a5a73a741b6f54e079c05973736672
Change-Id: I28092379c7a5a73a741b6f54e079c05973736672
| -rw-r--r-- | build_config/trunk_food.scl | 14 | ||||
| -rw-r--r-- | release_config_map.mk | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/build_config/trunk_food.scl b/build_config/trunk_food.scl index 0618021..17601c8 100644 --- a/build_config/trunk_food.scl +++ b/build_config/trunk_food.scl @@ -22,11 +22,15 @@ Build flag values for release config trunk_food. # load("//build/make/core/release_config.scl", "value") -load("//build/release/build_config/trunk_versions.scl", "platform_version_flags") -# Flags should be alphabetical by flag name to reduce merge conflifcts +################################################################################ +# +# DO NOT EDIT THIS FILE +# +# Flag values should be changed in `trunk.scl`, not here. This file should +# only be used where trunk_food differs from trunk: RELEASE_ACONFIG_VALUE_SETS +# is the only difference at this time. +################################################################################ values = [ value("RELEASE_ACONFIG_VALUE_SETS", "//build/release/aconfig/trunk_food:aconfig_value_set-aosp-trunk_food"), - value("RELEASE_ANGLE_ON_SYSTEM", True), - value("RELEASE_DEPRECATE_VNDK", True), -] + platform_version_flags +] diff --git a/release_config_map.mk b/release_config_map.mk index 063ca2f..9d1dae2 100644 --- a/release_config_map.mk +++ b/release_config_map.mk @@ -22,7 +22,7 @@ FLAG_DECLARATION_FILES := $(local_dir)build_flags.scl # Attach the flag value definitions to the various release configurations. $(call declare-release-config, next, $(local_dir)build_config/next.scl) $(call declare-release-config, trunk, $(local_dir)build_config/trunk.scl) -$(call declare-release-config, trunk_food, $(local_dir)build_config/trunk_food.scl) +$(call declare-release-config, trunk_food, $(local_dir)build_config/trunk_food.scl, trunk) $(call declare-release-config, trunk_staging, $(local_dir)build_config/trunk_staging.scl) # Temporary, until we remove the old "staging" configs |