| commit | 4bf0af4199d7849374e6df05e9888ebcc8746376 | [log] [tgz] |
|---|---|---|
| author | Yu Wu <yuwu@google.com> | Wed Dec 02 23:57:41 2020 +0000 |
| committer | Yu Wu <yuwu@google.com> | Thu Dec 03 05:22:33 2020 +0000 |
| tree | a932a3784ae397d2e84a901bf674effdf8cb6fc3 | |
| parent | 54e92c980d089bb3c4add736c459529111ac5dc4 [diff] |
Revert "Cherrypicked from https://android-review.git.corp.google..." Revert "Cherrypicked from https://android-review.googlesource.co..." Revert "Rebase to master@ 6976336" Revert "Rebase to master@ 6976336" Revert "Cherrypicked from https://android-review.googlesource.co..." Revert "Rebase to master@ 6976336" Revert submission 13068802-rebase_tf_173451928 Reason for revert: It leads to test flakiness and the coverage tests are not executed at all: https://b.corp.google.com/issues/173451928#comment47 Reverted Changes: I249714c9e:Cherrypick from aosp/1478357. I572e5c2ad:Cherrypick from https://android-review.googlesourc... I56119259a:Cherrypicked from https://android-review.git.corp.... Id204d5385:Update build api library. I9693182b7:Cherrypicked from https://android-review.googlesou... I270764875:Cherrypicked from https://android-review.googlesou... Iccd4e0e52:Cherrypick from: https://googleplex-android-review... I69ef44a39:Cherrypick from: https://android-review.googlesour... Ia9303dd1f:Cherrypick from: https://android-review.googlesour... I569229605:Rebase to master@ 6976336 I58902ca81:Rebase to master@ 6976336 and copy the change in a... I32e150372:Rebase to master@ 6976336 I3460d928c:Rebase to master@ 6976336 I63e2bedb6:Rebase to master@ 6976336 I82c2f9159:Rebase to master@ 6976336 Exempt-From-Owner-Approval: revert. Change-Id: Ib6b5245512e74699fab45c2ec4cafe2a6ee7aa46 Merged-In: I56119259add1435215958b51a58bc1b971f27067
diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk index a820a28..cb84a5c 100644 --- a/core/tasks/general-tests.mk +++ b/core/tasks/general-tests.mk
@@ -14,10 +14,12 @@ .PHONY: general-tests +# TODO(b/149249068): Remove vts10-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-tradefed.jar \ + $(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed.jar intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests) general_tests_zip := $(PRODUCT_OUT)/general-tests.zip