StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE ANYWHERE Revert "Require protobuf for build flags"

Browse Source 
This reverts commit 8663122eac.

Reason for revert: Was DNMA aosp/main with same ChangeId.  Will resubmit with new one, so that it actually merges.

Change-Id: Ifa1b3b3901b88882f5ea790b0cc582bd828a8619
This commit is contained in:
LaMont Jones
2024-06-03 22:04:56 +00:00
parent 8663122eac
commit d0b3b82d20
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/release_config.mk
View File

@@ -49,6 +49,9 @@ 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), \
@@ -61,7 +64,7 @@ config_map_files := $(wildcard build/release/release_config_map.mk) \
) \
)
protobuf_map_files := build/release/release_config_map.textproto \
protobuf_map_files := $(wildcard 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, \
@@ -73,9 +76,6 @@ protobuf_map_files := 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.