Require protobuf for build flags

This change forces build flags from .scl to .textproto format.

This change resubmits commit 8663122eac
such that it will merge downstream.

Bug: 328495189
Bug: 338450506
Test: manual, TH
Ignore-AOSP-First: DNMA in aosp-main to avoid aosp-main-future
Change-Id: I024f620b55e5e655f2b7b4764b217744334f7995
This commit is contained in:
LaMont Jones
2024-06-04 11:45:53 -07:00
parent d0b3b82d20
commit 2ef7438ff5

View File

@@ -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.