From 390a0cf9e345e976b314089c6932284a342afaac Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Fri, 10 May 2024 17:21:25 +0000 Subject: 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 --- release_config_map.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'release_config_map.mk') 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 := -- cgit v1.2.3-59-g8ed1b