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

Merge "Only consider EXTRA_INSTALL_ZIPS relevant by their primary file" into main am: a4b1e92ee0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3083666

Change-Id: I343805800af09b237ce89c08b7dd44c37bcd30f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-13 23:18:00 +00:00
committed by Automerger Merge Worker
parent 91e478d07b a4b1e92ee0
commit 3a0ab9ac43
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/Makefile
View File

@@ -3406,12 +3406,12 @@ endif
FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_ROOT_FILES) $(INSTALLED_FILES_FILE_ROOT)
# Returns a list of all the zip files from EXTRA_INSTALL_ZIPS whose install destination is
# under $(1)
# Returns a list of EXTRA_INSTALL_ZIPS trios whose primary file is contained within $(1)
# The trios will contain the primary installed file : the directory to unzip the zip to : the zip
define relevant-extra-install-zips
$(strip $(foreach p,$(EXTRA_INSTALL_ZIPS), \
$(if $(filter $(1)/%,$(call word-colon,1,$(p))/), \
$(call word-colon,2,$(p)))))
$(if $(filter $(call word-colon,1,$(p)),$(1)), \
$(p))))
endef
# Writes a text file that contains all of the files that will be inside a partition.
@@ -3423,12 +3423,13 @@ endef
# $(2): The partition's staging directory
# $(3): Files to include in the partition
define write-partition-file-list
$(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(call relevant-extra-install-zips,$(2))
$(1): PRIVATE_RELEVANT_EXTRA_INSTALL_ZIPS := $(call relevant-extra-install-zips,$(filter $(2)/%,$(3)))
$(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $$(foreach p,$$(PRIVATE_RELEVANT_EXTRA_INSTALL_ZIPS),$$(call word-colon,3,$$(p)))
@echo Writing $$@
rm -f $$@
echo -n > $$@
$$(foreach f,$(subst $(2)/,,$(filter $(2)/%,$(3))),echo "$$(f)" >> $$@$$(newline))
$$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $$(EXTRA_INSTALL_ZIPS) >> $$@
$$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $$(PRIVATE_RELEVANT_EXTRA_INSTALL_ZIPS) >> $$@
endef
# -----------------------------------------------------------------