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

Commit f9156ffc authored by Naresh Kumar Podishetty (xWF)'s avatar Naresh Kumar Podishetty (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Include aconfig_flags.pb iff RELEASE_CREATE_ACONFIG_STORAGE_FILE is enabled." 

This reverts commit e7b245dc.

Reason for revert: <Droidmonitor created revert due to b/378775303. Will be verifying through ABTD before submission.>

Change-Id: I963e1a6f94b4485e8f8bf94c6b70eb36f7c61c6a
parent e7b245dc

core/packaging/flags.mk

+19 −19
Original line number Diff line number Diff line
@@ -60,6 +60,25 @@ $(strip $(1)): $(ACONFIG) $(strip $(3)) 
$(call copy-one-file, $(1), $(2))

endef



$(foreach partition, $(_FLAG_PARTITIONS), \

	$(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.pb, \

			$(aconfig_flag_summaries_protobuf.$(partition)), \

			$(partition), \

			$(sort \

				$(foreach m, $(call register-names-for-partition, $(partition)), \

					$(ALL_MODULES.$(m).ACONFIG_FILES) \

				) \

				$(if $(filter system, $(partition)), \

					$(foreach m, $(call register-names-for-partition, system_ext), \

						$(ALL_MODULES.$(m).ACONFIG_FILES) \

					) \

				) \

			) \

	)) \

)



# 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)), \
@@ -129,25 +148,6 @@ $(call copy-one-file, $(strip $(4)), $(8)) 
endef



ifeq ($(RELEASE_CREATE_ACONFIG_STORAGE_FILE),true)

$(foreach partition, $(_FLAG_PARTITIONS), \

	$(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.pb, \

			$(aconfig_flag_summaries_protobuf.$(partition)), \

			$(partition), \

			$(sort \

				$(foreach m, $(call register-names-for-partition, $(partition)), \

					$(ALL_MODULES.$(m).ACONFIG_FILES) \

				) \

				$(if $(filter system, $(partition)), \

					$(foreach m, $(call register-names-for-partition, system_ext), \

						$(ALL_MODULES.$(m).ACONFIG_FILES) \

					) \

				) \

			) \

	)) \

)



$(foreach partition, $(_FLAG_PARTITIONS), \

	$(eval aconfig_storage_package_map.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/aconfig/package.map) \

	$(eval aconfig_storage_flag_map.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/aconfig/flag.map) \