From b324a11a6ac63ee88e84afb2e85eebdcfabd227f Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Thu, 30 May 2024 13:42:25 -0700 Subject: [PATCH] DO NOT MERGE ANYWHERE Require protobuf for build flags This change forces build flags from .scl to .textproto format. Bug: 328495189 Bug: 338450506 Test: manual, TH Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21 --- core/release_config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/release_config.mk b/core/release_config.mk index 887c78b07d..23f779199e 100644 --- a/core/release_config.mk +++ b/core/release_config.mk @@ -49,9 +49,6 @@ endif # If this is a google source tree, restrict it to only the one file # which has OWNERS control. If it isn't let others define their own. -# TODO: Remove wildcard for build/release one when all branch manifests -# have updated. -_must_protobuf := config_map_files := $(wildcard build/release/release_config_map.mk) \ $(wildcard vendor/google_shared/build/release/release_config_map.mk) \ $(if $(wildcard vendor/google/release/release_config_map.mk), \ @@ -64,7 +61,7 @@ config_map_files := $(wildcard build/release/release_config_map.mk) \ ) \ ) -protobuf_map_files := $(wildcard build/release/release_config_map.textproto) \ +protobuf_map_files := build/release/release_config_map.textproto \ $(wildcard vendor/google_shared/build/release/release_config_map.textproto) \ $(if $(wildcard vendor/google/release/release_config_map.textproto), \ vendor/google/release/release_config_map.textproto, \ @@ -76,6 +73,9 @@ protobuf_map_files := $(wildcard build/release/release_config_map.textproto) \ ) \ ) +# Remove support for the legacy approach. +_must_protobuf := true + # PRODUCT_RELEASE_CONFIG_MAPS is set by Soong using an initial run of product # config to capture only the list of config maps needed by the build. # Keep them in the order provided, but remove duplicates.