summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test-base/Android.bp2
-rw-r--r--test-runner/Android.bp17
2 files changed, 18 insertions, 1 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp
index 0088962b8a0c..d2da613c3832 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -97,7 +97,7 @@ java_library_static {
],
static_libs: [
- "android.test.runner",
+ "android.test.runner-minus-junit",
"android.test.mock",
],
diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index 104ae8236368..85844a0cff81 100644
--- 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 {