diff options
| author | Dennis Shen <dzshen@google.com> | 2024-03-26 12:25:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-26 12:25:03 +0000 |
| commit | 89839911758b721603f11ea2edaed34e5c319d96 (patch) | |
| tree | e46bc94bddf6e65e56ea0a069665a73eb2251467 | |
| parent | 1e13e587f54381a2cf3cf28cf044e8eb6422a1d3 (diff) | |
| parent | 34a21cae2582e4bc025a13a4254c39ff4e0aca07 (diff) | |
| download | build-89839911758b721603f11ea2edaed34e5c319d96.tar.gz | |
Merge "feed actual container name to storage file creation" into main
| -rw-r--r-- | core/packaging/flags.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/packaging/flags.mk b/core/packaging/flags.mk index 500efdd29b..e715fd1292 100644 --- a/core/packaging/flags.mk +++ b/core/packaging/flags.mk @@ -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 |