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

Commit eadde46c authored by Marybeth Fair's avatar Marybeth Fair
Browse files

Connect fingerprint build flag to v2. 

If RELEASE_FINGERPRINT_ACONFIG_PACKAGE is enabled, the storage file
version arg supplied to aconfig create-storage will be v2. Otherwise,
send v1 (current default).

As the build flag is not enabled, this change should be a no-op.
Confirmed by building that the files were still v1.

Test: manual
Change-Id: I2e3ef14c5a61bd1cbb2868f01a554af4d9e2a84b
parent ed045d30

core/packaging/flags.mk

+11 −4
Original line number Diff line number Diff line
@@ -109,10 +109,17 @@ $(eval $(call generate-global-aconfig-flag-file, \ 
define generate-partition-aconfig-storage-file

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

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



ifneq (,$(RELEASE_FINGERPRINT_ACONFIG_PACKAGES))

STORAGE_FILE_VERSION := 2

else

STORAGE_FILE_VERSION := 1

endif



$(strip $(1)): $(ACONFIG) $(strip $(9))

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

	$$(if $$(PRIVATE_IN), \

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

		$$(ACONFIG) create-storage --container $(10) --file package_map --out $$(PRIVATE_OUT) --version $$(STORAGE_FILE_VERSION) \

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

	)

	touch $$(PRIVATE_OUT)
@@ -121,7 +128,7 @@ $(eval $(strip $(2)): PRIVATE_IN := $(strip $(9))) 
$(strip $(2)): $(ACONFIG) $(strip $(9))

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

	$$(if $$(PRIVATE_IN), \

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

		$$(ACONFIG) create-storage --container $(10) --file flag_map --out $$(PRIVATE_OUT) --version $$(STORAGE_FILE_VERSION) \

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

	)

	touch $$(PRIVATE_OUT)
@@ -130,7 +137,7 @@ $(eval $(strip $(3)): PRIVATE_IN := $(strip $(9))) 
$(strip $(3)): $(ACONFIG) $(strip $(9))

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

	$$(if $$(PRIVATE_IN), \

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

		$$(ACONFIG) create-storage --container $(10) --file flag_val --out $$(PRIVATE_OUT) --version $$(STORAGE_FILE_VERSION) \

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

	)

	touch $$(PRIVATE_OUT)
@@ -139,7 +146,7 @@ $(eval $(strip $(4)): PRIVATE_IN := $(strip $(9))) 
$(strip $(4)): $(ACONFIG) $(strip $(9))

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

	$$(if $$(PRIVATE_IN), \

		$$(ACONFIG) create-storage --container $(10) --file flag_info --out $$(PRIVATE_OUT) \

		$$(ACONFIG) create-storage --container $(10) --file flag_info --out $$(PRIVATE_OUT) --version $$(STORAGE_FILE_VERSION) \

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

	)

	touch $$(PRIVATE_OUT)