StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feed actual container name to storage file creation

Browse Source 
Bug: b/328491388
Test: m
Change-Id: I278cfc9b8e1818d67514fbf1682850aa297ae851
This commit is contained in:
Dennis Shen
2024-03-25 19:56:33 +00:00
parent 1e13e587f5
commit 34a21cae25
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/packaging/flags.mk
View File

@@ -119,13 +119,14 @@ $(eval $(call generate-partition-aconfig-flag-file, \
# $(5): installed aconfig flags storage flag map file (out) # $(5): installed aconfig flags storage flag map file (out)
# $(6): installed aconfig flags storage flag value file (out) # $(6): installed aconfig flags storage flag value file (out)
# $(7): input aconfig files for the partition (in) # $(7): input aconfig files for the partition (in)
# $(8): partition name
define generate-partition-aconfig-storage-file define generate-partition-aconfig-storage-file
$(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1))) $(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1)))
$(eval $(strip $(1)): PRIVATE_IN := $(strip $(7))) $(eval $(strip $(1)): PRIVATE_IN := $(strip $(7)))
$(strip $(1)): $(ACONFIG) $(strip $(7)) $(strip $(1)): $(ACONFIG) $(strip $(7))
mkdir -p $$(dir $$(PRIVATE_OUT)) mkdir -p $$(dir $$(PRIVATE_OUT))
$$(if $$(PRIVATE_IN), \ $$(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)), \ $$(addprefix --cache ,$$(PRIVATE_IN)), \
) )
touch $$(PRIVATE_OUT) touch $$(PRIVATE_OUT)
@@ -134,7 +135,7 @@ $(eval $(strip $(2)): PRIVATE_IN := $(strip $(7)))
$(strip $(2)): $(ACONFIG) $(strip $(7)) $(strip $(2)): $(ACONFIG) $(strip $(7))
mkdir -p $$(dir $$(PRIVATE_OUT)) mkdir -p $$(dir $$(PRIVATE_OUT))
$$(if $$(PRIVATE_IN), \ $$(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)), \ $$(addprefix --cache ,$$(PRIVATE_IN)), \
) )
touch $$(PRIVATE_OUT) touch $$(PRIVATE_OUT)
@@ -143,7 +144,7 @@ $(eval $(strip $(3)): PRIVATE_IN := $(strip $(7)))
$(strip $(3)): $(ACONFIG) $(strip $(7)) $(strip $(3)): $(ACONFIG) $(strip $(7))
mkdir -p $$(dir $$(PRIVATE_OUT)) mkdir -p $$(dir $$(PRIVATE_OUT))
$$(if $$(PRIVATE_IN), \ $$(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)), \ $$(addprefix --cache ,$$(PRIVATE_IN)), \
) )
touch $$(PRIVATE_OUT) touch $$(PRIVATE_OUT)
@@ -167,6 +168,7 @@ $(foreach partition, $(_FLAG_PARTITIONS), \
$(sort $(foreach m,$(call register-names-for-partition, $(partition)), \ $(sort $(foreach m,$(call register-names-for-partition, $(partition)), \
$(ALL_MODULES.$(m).ACONFIG_FILES) \ $(ALL_MODULES.$(m).ACONFIG_FILES) \
)), \ )), \
$(partition), \
)) \ )) \
) )
endif endif