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

Commit 34a21cae authored by Dennis Shen's avatar Dennis Shen
Browse files

feed actual container name to storage file creation 

Bug: b/328491388
Test: m
Change-Id: I278cfc9b8e1818d67514fbf1682850aa297ae851
parent 1e13e587

core/packaging/flags.mk

+5 −3
Original line number Diff line number Diff line
@@ -119,13 +119,14 @@ $(eval $(call generate-partition-aconfig-flag-file, \ 
# $(5): installed aconfig flags storage flag map file (out)

# $(6): installed aconfig flags storage flag value file (out)

# $(7): input aconfig files for the partition (in)

# $(8): partition name

define generate-partition-aconfig-storage-file

$(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1)))

$(eval $(strip $(1)): PRIVATE_IN := $(strip $(7)))

$(strip $(1)): $(ACONFIG) $(strip $(7))

	mkdir -p $$(dir $$(PRIVATE_OUT))

	$$(if $$(PRIVATE_IN), \

		$$(ACONFIG) create-storage --container "" --file package_map --out $$(PRIVATE_OUT) \

		$$(ACONFIG) create-storage --container $(8) --file package_map --out $$(PRIVATE_OUT) \

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

	)

	touch $$(PRIVATE_OUT)
@@ -134,7 +135,7 @@ $(eval $(strip $(2)): PRIVATE_IN := $(strip $(7))) 
$(strip $(2)): $(ACONFIG) $(strip $(7))

	mkdir -p $$(dir $$(PRIVATE_OUT))

	$$(if $$(PRIVATE_IN), \

		$$(ACONFIG) create-storage --container "" --file flag_map --out $$(PRIVATE_OUT) \

		$$(ACONFIG) create-storage --container $(8) --file flag_map --out $$(PRIVATE_OUT) \

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

	)

	touch $$(PRIVATE_OUT)
@@ -143,7 +144,7 @@ $(eval $(strip $(3)): PRIVATE_IN := $(strip $(7))) 
$(strip $(3)): $(ACONFIG) $(strip $(7))

	mkdir -p $$(dir $$(PRIVATE_OUT))

	$$(if $$(PRIVATE_IN), \

		$$(ACONFIG) create-storage --container "" --file flag_val --out $$(PRIVATE_OUT) \

		$$(ACONFIG) create-storage --container $(8) --file flag_val --out $$(PRIVATE_OUT) \

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

	)

	touch $$(PRIVATE_OUT)
@@ -167,6 +168,7 @@ $(foreach partition, $(_FLAG_PARTITIONS), \ 
				$(sort $(foreach m,$(call register-names-for-partition, $(partition)), \

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

				)), \

				$(partition), \

	)) \

)

endif