tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Require protobuf for build flags

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

Bug: 328495189
Bug: 338450506
Test: manual, TH
Merged-In: Ia33aae158d62c12666d97449cea0c02b60550a21
Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21
This commit is contained in:
LaMont Jones 2024-05-30 13:42:25 -07:00
parent 03468748d3
commit e3e84fc1b7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/release_config.mk
View file

@ -49,9 +49,6 @@ endif
# If this is a google source tree, restrict it to only the one file # 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. # 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) \ config_map_files := $(wildcard build/release/release_config_map.mk) \
$(wildcard vendor/google_shared/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), \ $(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) \ $(wildcard vendor/google_shared/build/release/release_config_map.textproto) \
$(if $(wildcard vendor/google/release/release_config_map.textproto), \ $(if $(wildcard vendor/google/release/release_config_map.textproto), \
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 # 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. # config to capture only the list of config maps needed by the build.
# Keep them in the order provided, but remove duplicates. # Keep them in the order provided, but remove duplicates.