diff options
| author | 2024-05-10 19:12:41 +0000 | |
|---|---|---|
| committer | 2024-05-10 19:30:27 +0000 | |
| commit | fc89551f8df66a730d6beea9f2f95d247bdd5f83 (patch) | |
| tree | 82fa5c9955214f293f8917e8549d932918e220f9 /release_config_map.mk | |
| parent | 39a297faeb4325d3c67d28002275bb0da6c5b301 (diff) | |
Resubmit "Require protobuf except for ap2a"
This reverts commit 390a0cf9e345e976b314089c6932284a342afaac.
Reason for revert: resubmitting once the deprecated builds targets are disabled on git_main-without-vendor (cl/632571091)
Change-Id: I7e960badcde1e288bec85195b5107024a0111fa1
Diffstat (limited to 'release_config_map.mk')
| -rw-r--r-- | release_config_map.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/release_config_map.mk b/release_config_map.mk index 16d27760..a7f1d4db 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) -$(call declare-release-config, trunk, $(local_dir)build_config/trunk.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) +$(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) # 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, trunk_staging) +$(call declare-release-config, protobuf_flags, $(local_dir)build_config/protobuf_flags.scl $(local_dir)build_config/fail.scl, trunk_staging) local_dir := |