diff --git a/core/tasks/tools/vts_package_utils.mk b/core/tasks/tools/vts_package_utils.mk new file mode 100644 index 000000000..47bf29cf0 --- /dev/null +++ b/core/tasks/tools/vts_package_utils.mk @@ -0,0 +1,33 @@ +# +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# $(1): List of target native files to copy. +# $(2): Copy destination directory. +# Evaluates to a list of ":"-separated pairs src:dst. +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),\ + $(eval bui_ins := $(subst :,$(space),$(i)))\ + $(eval ins := $(word 2,$(bui_ins)))\ + $(if $(filter $(TARGET_OUT_ROOT)/%,$(ins)),\ + $(eval bui := $(word 1,$(bui_ins)))\ + $(eval my_copy_dest := $(patsubst data/%,DATA/%,\ + $(patsubst system/%,DATA/%,\ + $(patsubst $(PRODUCT_OUT)/%,%,$(ins)))))\ + $(bui):$(2)/$(my_copy_dest)))) +endef diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk index a3247da34..95c4d24a9 100644 --- a/core/tasks/vts-core-tests.mk +++ b/core/tasks/vts-core-tests.mk @@ -15,6 +15,8 @@ -include external/linux-kselftest/android/kselftest_test_list.mk -include external/ltp/android/ltp_package_list.mk +include $(BUILD_SYSTEM)/tasks/tools/vts_package_utils.mk + test_suite_name := vts test_suite_tradefed := vts-tradefed test_suite_readme := test/vts/tools/vts-core-tradefed/README