From 56d335bdb5247eca27dacbc29c1978186162edad Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Tue, 2 May 2023 18:14:09 +0000 Subject: [PATCH] Revert "Add Traefed Contrib to CATBox" This reverts commit a527b1a0ee82cc5a6c78e44ed6eaf7d71f710a1b. Reason for revert: tradefed-contrib isn't an allowed dependency outside tradefed. Suites shouldn't use it. This breaks prebuilts in udc-* Bug: 280372052 Change-Id: Id840568f36a801e19e7bb8e9c34cef2aeb625f1d Ignore-AOSP-First: revert of CL submitted in internal anyway --- core/tasks/catbox.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/core/tasks/catbox.mk b/core/tasks/catbox.mk index a771a935ba..443f4bbe95 100644 --- a/core/tasks/catbox.mk +++ b/core/tasks/catbox.mk @@ -16,7 +16,6 @@ test_suite_name := catbox test_suite_tradefed := catbox-tradefed test_suite_readme := test/catbox/tools/catbox-tradefed/README test_suite_tools := $(HOST_OUT_JAVA_LIBRARIES)/catbox-report-lib.jar -test_suite_tools += $(HOST_OUT_JAVA_LIBRARIES)/tradefed-contrib.jar include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk