Merge "Dedupe input for target-native-copy-pairs" into main am: 65c865bd05

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

Change-Id: Id81f7f74e65c191bb2d35f31a5bed94a2e90545f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-03-27 01:42:41 +00:00 committed by Automerger Merge Worker
commit 2536dc3bea

View file

@ -21,7 +21,7 @@ define target-native-copy-pairs
$(foreach m,$(1),\ $(foreach m,$(1),\
$(eval _built_files := $(strip $(ALL_MODULES.$(m).BUILT_INSTALLED)\ $(eval _built_files := $(strip $(ALL_MODULES.$(m).BUILT_INSTALLED)\
$(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).BUILT_INSTALLED)))\ $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).BUILT_INSTALLED)))\
$(foreach i, $(_built_files),\ $(foreach i, $(sort $(_built_files)),\
$(eval bui_ins := $(subst :,$(space),$(i)))\ $(eval bui_ins := $(subst :,$(space),$(i)))\
$(eval ins := $(word 2,$(bui_ins)))\ $(eval ins := $(word 2,$(bui_ins)))\
$(if $(filter $(TARGET_OUT_ROOT)/%,$(ins)),\ $(if $(filter $(TARGET_OUT_ROOT)/%,$(ins)),\