diff options
| author | yangbill <yangbill@google.com> | 2024-03-26 03:34:41 +0000 |
|---|---|---|
| committer | yangbill <yangbill@google.com> | 2024-03-26 03:34:41 +0000 |
| commit | ee0a77ba3ad5bcfbfb08ddbd9c70c2461c87ef08 (patch) | |
| tree | e113e09e8d7a119dda2318f42d697bfe5f9d0428 | |
| parent | 89fefda17433f3e665e650e984389227a34f23ab (diff) | |
| download | build-ee0a77ba3ad5bcfbfb08ddbd9c70c2461c87ef08.tar.gz | |
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
| -rw-r--r-- | core/tasks/tools/vts_package_utils.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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)),\ |