Merge "Remove junit classes from legacy-android-test" am: 4418418adb

am: d724c112f3 Change-Id: I82688070910b342152f4076425ac2fedbf41be7c
2018-01-13 21:25:58 +00:00
parent 765a976936 d724c112f3
commit 8e632576ed
2 changed files with 18 additions and 1 deletions
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -77,7 +77,7 @@ java_library_static {
    ],

    static_libs: [
-        "android.test.runner",
+        "android.test.runner-minus-junit",
        "android.test.mock",
    ],

--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -29,6 +29,23 @@ java_library {
    ],
 }

+// 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 {