diff options
| author | Julien Desprez <jdesprez@google.com> | 2023-03-22 02:13:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-22 02:13:17 +0000 |
| commit | 6bc1b2deed05b6f8b8f0b5b13cd1ad293f579dfa (patch) | |
| tree | 94f08bbb3cc48d0aba2fa7de93bfd6db560de279 | |
| parent | f713347d0f073e0532f51ca34b3456f496b4249e (diff) | |
| parent | 50d29f770bdc91ace4ee3204fd42d7a29852d146 (diff) | |
| download | build-6bc1b2deed05b6f8b8f0b5b13cd1ad293f579dfa.tar.gz | |
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151
Change-Id: I1fd20f11bb37a544fb19558d4cbf77571a0bd899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/tasks/tools/compatibility.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 4b8bd16c2e..cfae490c30 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -30,7 +30,6 @@ test_suite_subdir := android-$(test_suite_name) out_dir := $(HOST_OUT)/$(test_suite_name)/$(test_suite_subdir) test_artifacts := $(COMPATIBILITY.$(test_suite_name).FILES) test_tools := $(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/tradefed-no-fwk.jar \ $(HOST_OUT_JAVA_LIBRARIES)/tradefed-test-framework.jar \ $(HOST_OUT_JAVA_LIBRARIES)/loganalysis.jar \ $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \ |