Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 890b2aaf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't reference target-specific variable from dependency list" into main am: baf2c6bf 

Original change: https://android-review.googlesource.com/c/platform/build/+/3094565



Change-Id: I30ed53533a40b2c73287bb87c6aa3d66b529c34e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ccc2b40 baf2c6bf

core/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -3423,13 +3423,12 @@ endef 
#   $(2): The partition's staging directory

#   $(3): Files to include in the partition

define write-partition-file-list

$(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)))

$(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(foreach p,$(call relevant-extra-install-zips,$(filter $(2)/%,$(3))),$(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) $$(PRIVATE_RELEVANT_EXTRA_INSTALL_ZIPS) >> $$@

	$$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $(call relevant-extra-install-zips,$(filter $(2)/%,$(3))) >> $$@

endef



# -----------------------------------------------------------------