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

Commit 5d2cf641 authored by Marybeth Fair's avatar Marybeth Fair Committed by Automerger Merge Worker
Browse files

Merge "Connect fingerprint build flag to v2." into main am: b3a5c380 am: bc3fb441 

Original change: https://android-review.googlesource.com/c/platform/build/+/3409372



Change-Id: I19dcab474c8daf63aae545a3aaad74946a3d4282
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2516ee5b bc3fb441

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)