summaryrefslogtreecommitdiff
path: root/release_config_map.mk
diff options
context:
space:
mode:
author Liana Kazanova <lkazanova@google.com> 2024-05-10 17:21:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-10 17:21:25 +0000
commit390a0cf9e345e976b314089c6932284a342afaac (patch)
tree8825e068b00d4011af0665299f7a845c58246fff /release_config_map.mk
parent5e224a1edbdc2f38dd9ececad71d2d9f5cf8f762 (diff)
Revert "Require protobuf except for ap2a"
This reverts commit 5e224a1edbdc2f38dd9ececad71d2d9f5cf8f762. Reason for revert:DroidMonitor. Potential culprit for b/339848877 - verifying through ABTD before submission. Change-Id: I2f2de0571c8273518784b4d36cde84965aa18e52
Diffstat (limited to 'release_config_map.mk')
-rw-r--r--release_config_map.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/release_config_map.mk b/release_config_map.mk
index a7f1d4db..16d27760 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)
+$(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)
# 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)
+$(call declare-release-config, protobuf_flags, $(local_dir)build_config/protobuf_flags.scl, trunk_staging)
local_dir :=