From 67e5ec6202239cec33cf10b35d627914fa80c99e Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Tue, 24 Nov 2020 13:20:04 -0800 Subject: [PATCH] Remove unit tests jar from suites Remove unit tests jar from official suite packaging they will be run & tested externally as real unit tests. Include the compatiblity-tradefed.jar element as it will be needed. Test: make cts; run cts-unit-tests Bug: 173811050 Change-Id: Ie808c7422e35c48c9392f7179806745ef392de64 --- core/tasks/tools/compatibility.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 66f3b5bf0..570a39a34 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -34,9 +34,7 @@ test_tools := $(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar \ $(HOST_OUT_JAVA_LIBRARIES)/tradefed-test-framework.jar \ $(HOST_OUT_JAVA_LIBRARIES)/loganalysis.jar \ $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util-tests.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/compatibility-common-util-tests.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/compatibility-tradefed-tests.jar \ + $(HOST_OUT_JAVA_LIBRARIES)/compatibility-tradefed.jar \ $(HOST_OUT_JAVA_LIBRARIES)/$(test_suite_tradefed).jar \ $(HOST_OUT_JAVA_LIBRARIES)/$(test_suite_tradefed)-tests.jar \ $(HOST_OUT_EXECUTABLES)/$(test_suite_tradefed) \