diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-27 22:26:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-27 22:26:13 +0000 |
| commit | 6ebc180650bc4e61b4eed0909b1c587c3e1f63ad (patch) | |
| tree | 577e4a5865bdce06f24d2a91c582681a183f2db9 | |
| parent | 7ca340fb91c4a1bfd5aac6eab355a9f5a90eb31f (diff) | |
| parent | 04c90d44f783d0f0b5397486c318f34454fc6692 (diff) | |
| download | build-6ebc180650bc4e61b4eed0909b1c587c3e1f63ad.tar.gz | |
Merge "Package vts-tradefed.jar in general-tests" am: 04c90d44f7
Change-Id: I674f8f399cc67c30c0dfd4fd129775045c5bed93
| -rw-r--r-- | core/tasks/general-tests.mk | 2 |
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 |