From ee0a77ba3ad5bcfbfb08ddbd9c70c2461c87ef08 Mon Sep 17 00:00:00 2001 From: yangbill Date: Tue, 26 Mar 2024 03:34:41 +0000 Subject: Dedupe input for target-native-copy-pairs $(ALL_MODULES.$(m).BUILT_INSTALLED) may have duplicated value which may lead to `overriding commands for target` error. Bug: 331135912 Test: m ltp Test: m vts Test: m vts_kernel_ltp_tests Change-Id: Ia84ece733cb4062ea5ca1f2f702c145cd4df2a0b --- core/tasks/tools/vts_package_utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tasks/tools/vts_package_utils.mk b/core/tasks/tools/vts_package_utils.mk index 06161f0b3c..1a819f2172 100644 --- a/core/tasks/tools/vts_package_utils.mk +++ b/core/tasks/tools/vts_package_utils.mk @@ -21,7 +21,7 @@ define target-native-copy-pairs $(foreach m,$(1),\ $(eval _built_files := $(strip $(ALL_MODULES.$(m).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 ins := $(word 2,$(bui_ins)))\ $(if $(filter $(TARGET_OUT_ROOT)/%,$(ins)),\ -- cgit v1.2.3