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

Merge "Revert "Do not generate aconfig_flags.textproto"" into main

Browse source
This commit is contained in:
Ted Bauer 2023-10-26 16:46:57 +00:00 committed by Gerrit Code Review
commit 6866204083
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/packaging/flags.mk
View file

@ -72,28 +72,42 @@ $(foreach partition, $(_FLAG_PARTITIONS), \
# $(1): built aconfig flags file (out) # $(1): built aconfig flags file (out)
# $(2): installed aconfig flags file (out) # $(2): installed aconfig flags file (out)
# $(3): input aconfig files for the partition (in) # $(3): input aconfig files for the partition (in)
# $(4): file format, passed to `aconfig dump` (in)
# $(5): text placed in aconfig file when no flags present (out)
define generate-partition-aconfig-flag-file define generate-partition-aconfig-flag-file
$(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1))) $(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1)))
$(eval $(strip $(1)): PRIVATE_IN := $(strip $(3))) $(eval $(strip $(1)): PRIVATE_IN := $(strip $(3)))
$(strip $(1)): $(ACONFIG) $(strip $(3)) $(strip $(1)): $(ACONFIG) $(strip $(3))
mkdir -p $$(dir $$(PRIVATE_OUT)) mkdir -p $$(dir $$(PRIVATE_OUT))
$$(if $$(PRIVATE_IN), \ $$(if $$(PRIVATE_IN), \
$$(ACONFIG) dump --format protobuf --out $$(PRIVATE_OUT) \ $$(ACONFIG) dump --format $(4) --out $$(PRIVATE_OUT) \
$$(addprefix --cache ,$$(PRIVATE_IN)), \ $$(addprefix --cache ,$$(PRIVATE_IN)), \
echo -n > $$(PRIVATE_OUT) \ echo -n "$(5)" > $$(PRIVATE_OUT) \
) )
$(call copy-one-file, $(1), $(2)) $(call copy-one-file, $(1), $(2))
endef endef
$(foreach partition, $(_FLAG_PARTITIONS), \ $(foreach partition, $(_FLAG_PARTITIONS), \
$(eval aconfig_flag_summaries_textproto.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/aconfig_flags.textproto) \
$(eval aconfig_flag_summaries_protobuf.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/aconfig_flags.pb) \ $(eval aconfig_flag_summaries_protobuf.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/aconfig_flags.pb) \
$(eval $(call generate-partition-aconfig-flag-file, \
$(TARGET_OUT_FLAGS)/$(partition)/aconfig_flags.textproto, \
$(aconfig_flag_summaries_textproto.$(partition)), \
$(sort $(foreach m,$(call register-names-for-partition, $(partition)), \
$(ALL_MODULES.$(m).ACONFIG_FILES) \
)), \
textproto, \
"# No aconfig flags" \
)) \
$(eval $(call generate-partition-aconfig-flag-file, \ $(eval $(call generate-partition-aconfig-flag-file, \
$(TARGET_OUT_FLAGS)/$(partition)/aconfig_flags.pb, \ $(TARGET_OUT_FLAGS)/$(partition)/aconfig_flags.pb, \
$(aconfig_flag_summaries_protobuf.$(partition)), \ $(aconfig_flag_summaries_protobuf.$(partition)), \
$(sort $(foreach m,$(call register-names-for-partition, $(partition)), \ $(sort $(foreach m,$(call register-names-for-partition, $(partition)), \
$(ALL_MODULES.$(m).ACONFIG_FILES) \ $(ALL_MODULES.$(m).ACONFIG_FILES) \
)), \ )), \
protobuf, \
"" \
)) \ )) \
) )
@ -103,6 +117,7 @@ $(foreach partition, $(_FLAG_PARTITIONS), \
required_flags_files := \ required_flags_files := \
$(sort $(foreach partition, $(filter $(IMAGES_TO_BUILD), $(_FLAG_PARTITIONS)), \ $(sort $(foreach partition, $(filter $(IMAGES_TO_BUILD), $(_FLAG_PARTITIONS)), \
$(build_flag_summaries.$(partition)) \ $(build_flag_summaries.$(partition)) \
$(aconfig_flag_summaries_textproto.$(partition)) \
$(aconfig_flag_summaries_protobuf.$(partition)) \ $(aconfig_flag_summaries_protobuf.$(partition)) \
)) ))
@ -118,6 +133,7 @@ flag-files: $(required_flags_files)
required_flags_files:= required_flags_files:=
$(foreach partition, $(_FLAG_PARTITIONS), \ $(foreach partition, $(_FLAG_PARTITIONS), \
$(eval build_flag_summaries.$(partition):=) \ $(eval build_flag_summaries.$(partition):=) \
$(eval aconfig_flag_summaries_textproto.$(partition):=) \
$(eval aconfig_flag_summaries_protobuf.$(partition):=) \ $(eval aconfig_flag_summaries_protobuf.$(partition):=) \
) )