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

This commit is contained in:
Treehugger Robot
2020-02-27 22:17:19 +00:00
committed by Gerrit Code Review

View File

@@ -14,10 +14,12 @@
.PHONY: general-tests .PHONY: general-tests
# TODO(b/149249068): Remove vts-tradefed.jar after all VTS tests are converted
general_tests_tools := \ general_tests_tools := \
$(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \ $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \
$(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \ $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \
$(HOST_OUT_JAVA_LIBRARIES)/vts-core-tradefed.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) intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests)
general_tests_zip := $(PRODUCT_OUT)/general-tests.zip general_tests_zip := $(PRODUCT_OUT)/general-tests.zip