Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ac53045 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

Do not generate aconfig_flags.textproto 

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
parent 9ef1caab

core/packaging/flags.mk

+2 −18
Original line number Original line Diff line number Diff line
@@ -72,42 +72,28 @@ $(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 $(4) --out $$(PRIVATE_OUT) \

		$$(ACONFIG) dump --format protobuf --out $$(PRIVATE_OUT) \

			$$(addprefix --cache ,$$(PRIVATE_IN)), \

			$$(addprefix --cache ,$$(PRIVATE_IN)), \

		echo $(5) > $$(PRIVATE_OUT) \

		echo -n > $$(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, \

				"" \

	)) \

	)) \

)

)
@@ -117,7 +103,6 @@ $(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)) \

		))

		))
@@ -133,7 +118,6 @@ 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):=) \

)

)