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

Merge "Add device_aconfig_declarations target" into main am: 2135347927

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2937719

Change-Id: Ie9e6f2a3b50150fc9d0341803121a5d23b7fd949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
LaMont Jones
2024-01-30 23:59:52 +00:00
committed by Automerger Merge Worker
parent eb336b9a66 2135347927
commit c369db98a1
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/packaging/flags.mk
View File

@@ -97,6 +97,20 @@ $(foreach partition, $(_FLAG_PARTITIONS), \
)) \
)
# Collect the on-device flags into a single file, similar to all_aconfig_declarations.
required_aconfig_flags_files := \
$(sort $(foreach partition, $(filter $(IMAGES_TO_BUILD), $(_FLAG_PARTITIONS)), \
$(aconfig_flag_summaries_protobuf.$(partition)) \
))
.PHONY: device_aconfig_declarations
device_aconfig_declarations: $(PRODUCT_OUT)/device_aconfig_declarations.pb
$(eval $(call generate-partition-aconfig-flag-file, \
$(TARGET_OUT_FLAGS)/device_aconfig_declarations.pb, \
$(PRODUCT_OUT)/device_aconfig_declarations.pb, \
$(sort $(required_aconfig_flags_files)) \
)) \
# Create a set of storage file for each partition
# $(1): built aconfig flags storage package map file (out)
# $(2): built aconfig flags storage flag map file (out)
@@ -178,6 +192,7 @@ flag-files: $(required_flags_files)
# Clean up
required_flags_files:=
required_aconfig_flags_files:=
$(foreach partition, $(_FLAG_PARTITIONS), \
$(eval build_flag_summaries.$(partition):=) \
$(eval aconfig_flag_summaries_protobuf.$(partition):=) \