commit 2e188262451aa40572ba5be9bc8b67d2dca8a454
author Julien Desprez <jdesprez@google.com> Tue Nov 24 20:22:47 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 24 20:22:47 2020 +0000
tree 823e91286af8cbaa365819ddad5c072136f0a224
parent d06dde7bbf902aff148a1d87f9fc622fadcfefc7
parent 643df3a9afc83e99ff6111f22452b57e8beb7670

Avoid including a mocked test suite info am: 643df3a9af

Original change: https://android-review.googlesource.com/c/platform/test/suite_harness/+/1510168

Change-Id: I1830553ffe3aad92898d1fcb632397fe25849a8a

common/host-side/tradefed/tests/Android.bp

diff --git a/common/host-side/tradefed/tests/Android.bp b/common/host-side/tradefed/tests/Android.bp
index ac24cbd..328915a 100644
--- a/common/host-side/tradefed/tests/Android.bp
+++ b/common/host-side/tradefed/tests/Android.bp
@@ -26,21 +26,12 @@
 
     static_libs: [
         "tradefed",
-        "compatibility-mock-tradefed",
         "junit",
         "compatibility-host-util",
-	"easymock",
-	"objenesis-host",
-	"mockito-host",
+        "cts-tradefed-harness",
+        "easymock",
+        "objenesis-host",
+        "mockito-host",
     ],
 }
 
-
-tradefed_binary_host {
-    name: "compatibility-mock-tradefed",
-    visibility: ["//visibility:private"],
-    short_name: "TESTS",
-    full_name: "Compatibility Tests",
-    version: "1",
-    static_libs: ["cts-tradefed-harness"],
-}