diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-27 01:25:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-27 01:25:08 +0000 |
| commit | 65c865bd05dbb41316e7a3769018c40ce5ee797c (patch) | |
| tree | a7dde9f438aa5d8ccc93981fe26f3ae323850fac | |
| parent | 6f88286f46949baea9d14af1d2fd8465ff47926a (diff) | |
| parent | ee0a77ba3ad5bcfbfb08ddbd9c70c2461c87ef08 (diff) | |
| download | build-65c865bd05dbb41316e7a3769018c40ce5ee797c.tar.gz | |
Merge "Dedupe input for target-native-copy-pairs" into main
| -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)),\ |