diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-13 22:56:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-13 22:56:46 +0000 |
| commit | a4b1e92ee0bda805cb147c565997f84e037a3666 (patch) | |
| tree | facb57a9da155131c6ae72073e89b606398c4cb7 | |
| parent | db0c8d7986e0b856ebc1ff2886c190dfa6025adb (diff) | |
| parent | 5cba391313b3b5f1ff4aee6c31f893426eb52d7a (diff) | |
| download | build-main.tar.gz | |
| -rw-r--r-- | core/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile index 712719a300..4900ac2fdc 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 # ----------------------------------------------------------------- |