diff options
| author | 2024-05-13 09:53:59 -0700 | |
|---|---|---|
| committer | 2024-05-13 09:53:59 -0700 | |
| commit | 1beb95cbd8edadebfa2d707c6eaa37bc75d1996b (patch) | |
| tree | 329c68c423e4e9e1be1da10e701a65c8408852e5 /release_config_map.mk | |
| parent | 46a1236a3ebde01856e5426f5ccffad8a0d29d5a (diff) | |
Drop next, trunk, and trunk_food from build/release
These release configs are found in vendor/google_shared/build/release.
Bug: 328495189
Test: manual
Ignore-AOSP-First: will reconcile
Change-Id: Ib02fc4dea3a6d96adb4a0d2b6a732249373844d9
Diffstat (limited to 'release_config_map.mk')
| -rw-r--r-- | release_config_map.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/release_config_map.mk b/release_config_map.mk index a7f1d4db..54825722 100644 --- a/release_config_map.mk +++ b/release_config_map.mk @@ -20,15 +20,15 @@ local_dir := $(dir $(lastword $(MAKEFILE_LIST))) 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 $(local_dir)build_config/fail.scl) -$(call declare-release-config, trunk, $(local_dir)build_config/trunk.scl $(local_dir)build_config/fail.scl) -$(call declare-release-config, trunk_food, $(local_dir)build_config/trunk_food.scl $(local_dir)build_config/fail.scl, trunk) $(call declare-release-config, trunk_staging, $(local_dir)build_config/trunk_staging.scl $(local_dir)build_config/fail.scl) +# TODO: remove these when we can drop them everywhere. For now, fail of we +# try to use the outdated configs +$(call declare-release-config, next, $(local_dir)build_config/fail.scl) +$(call declare-release-config, trunk, $(local_dir)build_config/fail.scl) +$(call declare-release-config, trunk_food, $(local_dir)build_config/fail.scl, trunk) + # 24Q2, aka AP2A $(call declare-release-config, ap2a, $(local_dir)build_config/ap2a.scl) -# Temporary config to ease testing build flag migration to protobuf -$(call declare-release-config, protobuf_flags, $(local_dir)build_config/protobuf_flags.scl $(local_dir)build_config/fail.scl, trunk_staging) - local_dir := |