summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Shi <dshi@google.com> 2020-02-19 15:18:01 -0800
committer Dan Shi <dshi@google.com> 2020-02-19 15:22:11 -0800
commit7edfb7f6592d6da4217fcef7e9b6a23d77b7d76b (patch)
treee5f05db909a7c0186930f85aa93042412634cdfb
parentab39096ee794da6bd8ca855685b1732510773bc9 (diff)
Package vts-tradefed.jar in general-tests
vts-core.xml imports some vts only preparer to run un-converted vts python tests. Bug: 149249068 Test: unittest Change-Id: Ibdecb250f78c07d7645be4b140b8cfaeda99d79b
-rw-r--r--core/tasks/general-tests.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk
index 7bcc915835..53ebddc213 100644
--- a/core/tasks/general-tests.mk
+++ b/core/tasks/general-tests.mk
@@ -14,10 +14,12 @@
.PHONY: general-tests
+# TODO(b/149249068): Remove vts-tradefed.jar after all VTS tests are converted
general_tests_tools := \
$(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \
$(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \
$(HOST_OUT_JAVA_LIBRARIES)/vts-core-tradefed.jar \
+ $(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed.jar
intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests)
general_tests_zip := $(PRODUCT_OUT)/general-tests.zip