commit 3a0ab9ac43ac3e5ae02ea4ffb2ae35678bc5c449
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon May 13 23:18:00 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 13 23:18:00 2024 +0000
tree facb57a9da155131c6ae72073e89b606398c4cb7
parent 91e478d07b580f6a35e97352c4715f3d2bfa73f8
parent a4b1e92ee0bda805cb147c565997f84e037a3666

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

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>

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 712719a..4900ac2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3406,12 +3406,12 @@
 
 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 @@
 #   $(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
 
 # -----------------------------------------------------------------