commit 04c90d44f783d0f0b5397486c318f34454fc6692
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 27 22:17:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 27 22:17:19 2020 +0000
tree 14ca3f94a259bb70c2aa2e40f90c3ac6600eff85
parent 223d0557688195b64dcc27c901509c659688f58a
parent 7edfb7f6592d6da4217fcef7e9b6a23d77b7d76b

Merge "Package vts-tradefed.jar in general-tests"

core/tasks/general-tests.mk

diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk
index 7bcc915..53ebddc 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