StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Package vts-tradefed.jar in general-tests" am: 04c90d44f7

Browse Source 
Change-Id: I674f8f399cc67c30c0dfd4fd129775045c5bed93
This commit is contained in:
Automerger Merge Worker
2020-02-27 22:26:13 +00:00
parent 7ca340fb91 04c90d44f7
commit 6ebc180650
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tasks/general-tests.mk
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