From a1082fb0465a27021d78c4ef9e59051145f82460 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Thu, 7 May 2020 09:02:26 -0700 Subject: [PATCH] Revert "Add vts related artifacts to vts-core package" This reverts commit 5e06288e7c0550a632bb38648e8c6829d07a4b79. Bug: 149249068 Test: build Change-Id: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05 Merged-In: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05 --- core/tasks/vts-core-tests.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk index 4e83de597..a3247da34 100644 --- a/core/tasks/vts-core-tests.mk +++ b/core/tasks/vts-core-tests.mk @@ -12,15 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +-include external/linux-kselftest/android/kselftest_test_list.mk +-include external/ltp/android/ltp_package_list.mk + test_suite_name := vts test_suite_tradefed := vts-tradefed test_suite_readme := test/vts/tools/vts-core-tradefed/README -# TODO(b/149249068): Clean up after all VTS tests are converted. -vts_test_artifact_paths := -# Some repo may not include vts project. --include test/vts/tools/build/tasks/framework/vts_for_core_suite.mk - # Copy kernel test modules to testcases directories kernel_test_host_out := $(HOST_OUT_TESTCASES)/vts_kernel_tests kernel_test_vts_out := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)/testcases/vts_kernel_tests @@ -44,7 +42,6 @@ include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk $(compatibility_zip): $(copy_kernel_tests) .PHONY: vts -$(compatibility_zip): $(vts_test_artifact_paths) vts: $(compatibility_zip) $(call dist-for-goals, vts, $(compatibility_zip))