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

Do not generate aconfig_flags.textproto

Browse source 
The /<partition>/etc/aconfig_flags.textproto files are no longer needed
(all clients have migrated to use /<partition>/etc/aconfig_flags.pb).
Stop generating them.

Also update how an empty file is generated in case there are no flags
for a given partition. Previously

  echo "" > file

was used, which resulted in a file containing a newline, which caused
`printflags` to error out. Change the command to

  echo -n > file

to create an empty file.

Bug: 302452801
Bug: 304278614
Test: m nothing
Change-Id: I2f7d23df4e888046651b4155b75c5006d0b5e1d7
This commit is contained in:
Mårten Kongstad 2023-09-28 10:16:29 +02:00
parent 9ef1caabed
commit 0ac5304598
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/packaging/flags.mk
View file

@ -72,42 +72,28 @@ $(foreach partition, $(_FLAG_PARTITIONS), \
# $(1): built aconfig flags file (out)
# $(2): installed aconfig flags file (out)
# $(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
$(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1)))
$(eval $(strip $(1)): PRIVATE_IN := $(strip $(3)))
$(strip $(1)): $(ACONFIG) $(strip $(3))
mkdir -p $$(dir $$(PRIVATE_OUT))
$$(if $$(PRIVATE_IN), \
$$(ACONFIG) dump --format $(4) --out $$(PRIVATE_OUT) \
$$(ACONFIG) dump --format protobuf --out $$(PRIVATE_OUT) \
$$(addprefix --cache ,$$(PRIVATE_IN)), \
echo $(5) > $$(PRIVATE_OUT) \
echo -n > $$(PRIVATE_OUT) \
)
$(call copy-one-file, $(1), $(2))
endef
$(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 $(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, \
$(TARGET_OUT_FLAGS)/$(partition)/aconfig_flags.pb, \
$(aconfig_flag_summaries_protobuf.$(partition)), \
$(sort $(foreach m,$(call register-names-for-partition, $(partition)), \
$(ALL_MODULES.$(m).ACONFIG_FILES) \
)), \
protobuf, \
"" \
)) \
)
@ -117,7 +103,6 @@ $(foreach partition, $(_FLAG_PARTITIONS), \
required_flags_files := \
$(sort $(foreach partition, $(filter $(IMAGES_TO_BUILD), $(_FLAG_PARTITIONS)), \
$(build_flag_summaries.$(partition)) \
$(aconfig_flag_summaries_textproto.$(partition)) \
$(aconfig_flag_summaries_protobuf.$(partition)) \
))
@ -133,7 +118,6 @@ flag-files: $(required_flags_files)
required_flags_files:=
$(foreach partition, $(_FLAG_PARTITIONS), \
$(eval build_flag_summaries.$(partition):=) \
$(eval aconfig_flag_summaries_textproto.$(partition):=) \
$(eval aconfig_flag_summaries_protobuf.$(partition):=) \
)