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

Merge "Build build_flags.json in soong" into main am: 04837c61f3

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

Change-Id: Ia33e4242d757bf6be4158039d5f88147ec7d99b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-06-07 05:31:15 +00:00
committed by Automerger Merge Worker
parent 4203b5baa7 04837c61f3
commit 4401accfe0
5 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/packaging/flags.mk
View File

@@ -21,50 +21,6 @@
_FLAG_PARTITIONS := product system system_ext vendor _FLAG_PARTITIONS := product system system_ext vendor
# -----------------------------------------------------------------
# Release Config Flags
# Create a summary file of build flags for each partition
# $(1): built build flags json file
# $(2): installed build flags json file
# $(3): flag names
define generate-partition-build-flag-file
$(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1)))
$(eval $(strip $(1)): PRIVATE_FLAG_NAMES := $(strip $(3)))
$(strip $(1)):
mkdir -p $$(dir $$(PRIVATE_OUT))
echo '{' > $$(PRIVATE_OUT)
echo '"flags": [' >> $$(PRIVATE_OUT)
$$(foreach flag, $$(PRIVATE_FLAG_NAMES), \
( \
printf ' { "name": "%s", "value": "%s", ' \
'$$(flag)' \
'$$(_ALL_RELEASE_FLAGS.$$(flag).VALUE)' \
; \
printf '"set": "%s", "default": "%s", "declared": "%s" }' \
'$$(_ALL_RELEASE_FLAGS.$$(flag).SET_IN)' \
'$$(_ALL_RELEASE_FLAGS.$$(flag).DEFAULT)' \
'$$(_ALL_RELEASE_FLAGS.$$(flag).DECLARED_IN)' \
; \
printf '$$(if $$(filter $$(lastword $$(PRIVATE_FLAG_NAMES)),$$(flag)),,$$(comma))\n' ; \
) >> $$(PRIVATE_OUT) ; \
)
echo "]" >> $$(PRIVATE_OUT)
echo "}" >> $$(PRIVATE_OUT)
$(call copy-one-file, $(1), $(2))
endef
$(foreach partition, $(_FLAG_PARTITIONS), \
$(eval build_flag_summaries.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/build_flags.json) \
$(eval $(call generate-partition-build-flag-file, \
$(TARGET_OUT_FLAGS)/$(partition)/build_flags.json, \
$(build_flag_summaries.$(partition)), \
$(_ALL_RELEASE_FLAGS.PARTITIONS.$(partition)) \
) \
) \
)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Aconfig Flags # Aconfig Flags

1
target/product/base_product.mk
View File

@@ -16,6 +16,7 @@
# Base modules and settings for the product partition. # Base modules and settings for the product partition.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
build_flag_product \
fs_config_dirs_product \ fs_config_dirs_product \
fs_config_files_product \ fs_config_files_product \
group_product \ group_product \

1
target/product/base_system.mk
View File

@@ -45,6 +45,7 @@ PRODUCT_PACKAGES += \
bu \ bu \
bugreport \ bugreport \
bugreportz \ bugreportz \
build_flag_system \
cgroups.json \ cgroups.json \
charger \ charger \
cmd \ cmd \

1
target/product/base_system_ext.mk
View File

@@ -16,6 +16,7 @@
# Base modules and settings for the system_ext partition. # Base modules and settings for the system_ext partition.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
build_flag_system_ext \
fs_config_dirs_system_ext \ fs_config_dirs_system_ext \
fs_config_files_system_ext \ fs_config_files_system_ext \
group_system_ext \ group_system_ext \

1
target/product/base_vendor.mk
View File

@@ -18,6 +18,7 @@
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
adbd.recovery \ adbd.recovery \
android.hardware.health@2.0-impl-default.recovery \ android.hardware.health@2.0-impl-default.recovery \
build_flag_vendor \
cgroups.recovery.json \ cgroups.recovery.json \
charger.recovery \ charger.recovery \
init_second_stage.recovery \ init_second_stage.recovery \