From 7edfb7f6592d6da4217fcef7e9b6a23d77b7d76b Mon Sep 17 00:00:00 2001
From: Dan Shi <dshi@google.com>
Date: Wed, 19 Feb 2020 15:18:01 -0800
Subject: [PATCH] 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
---
 core/tasks/general-tests.mk | 2 ++
 1 file changed, 2 insertions(+)

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