Merge "Build tests against core library impls, not stubs" am: 867fa7c988 am: 89a3242b00

am: 79483297a3

Change-Id: I53d55a1b62e6e66457721a291194acef97810d11

2 files changed, 16 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index c368936..07923d7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,10 +25,12 @@ java_test {
         "sql/src/test/resources",
         "support/src/test/resources",
     ],
-    no_framework_libs: true,
+    no_standard_libs: true,
     libs: [
+        "core-all",
         "junit",
     ],
+    system_modules: "core-all-system-modules",
     javacflags: ["-Xmaxwarns 9999999"],
     jarjar_rules: "jarjar-rules.txt",
     // Pin java_version until jarjar is certified to support later versions. http://b/72703434
diff --git a/jdwp/Android.bp b/jdwp/Android.bp
index 37a9500..80703f5 100644
--- a/jdwp/Android.bp
+++ b/jdwp/Android.bp
@@ -12,21 +12,28 @@ java_test {
     hostdex: true,
     host_supported: true,
     srcs: ["src/test/java/**/*.java"],
-    no_framework_libs: true,
-    libs: ["junit"],
     static_libs: ["SourceDebugExtensionMockClass_gen"],
 
-    // b/73499927
-    errorprone: {
-        javacflags: ["-Xep:MissingOverride:OFF"],
-    },
+    libs: ["junit"],
 
+    no_standard_libs: true,
+    system_modules: "core-all-system-modules",
     target: {
+        // Only depend on core-all for the Android variant so we can avoid
+        // needing to create a core-all host variant.
+        android: {
+            libs: ["core-all"],
+        },
         host: {
             exclude_srcs: ["src/test/java/org/apache/harmony/jpda/tests/jdwp/DDM/**/*.java"],
         },
     },
 
+    // b/73499927
+    errorprone: {
+        javacflags: ["-Xep:MissingOverride:OFF"],
+    },
+
     jarjar_rules: "jarjar-rules.txt",
 }