commit 4418418adb87122fc038625fbc75bf662ad1773c
author Paul Duffin <paulduffin@google.com> Sat Jan 13 19:33:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 13 19:33:39 2018 +0000
tree e2a0a2a13fd60ead3bea8becacaea94eeba4b050
parent 22bd015cbacfd67b0901733740a01ac4674d8f92
parent a88eb29f9e0bd363fb3f1e02f379a54324a3e5ec

Merge "Remove junit classes from legacy-android-test"

test-base/Android.bp

diff --git a/test-base/Android.bp b/test-base/Android.bp
index 30c9af1..f6e1e51 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -77,7 +77,7 @@
     ],
 
     static_libs: [
-        "android.test.runner",
+        "android.test.runner-minus-junit",
         "android.test.mock",
     ],
 

test-runner/Android.bp

diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index cddfef8..d495e90 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -29,6 +29,23 @@
     ],
 }
 
+// Build the android.test.runner-minus-junit library
+// =================================================
+// This is provided solely for use by the legacy-android-test module.
+java_library {
+    name: "android.test.runner-minus-junit",
+
+    srcs: ["src/android/**/*.java"],
+
+    no_framework_libs: true,
+    libs: [
+        "framework",
+        "legacy-test",
+        "android.test.mock",
+        "junit",
+    ],
+}
+
 // Build the repackaged.android.test.runner library
 // ================================================
 java_library_static {