summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp3
-rw-r--r--jdwp/Android.bp5
2 files changed, 1 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 362ad39..0d92caf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,14 +47,13 @@ java_test {
"support/src/test/resources",
],
sdk_version: "none",
+ system_modules: "core-all-system-modules",
libs: [
- "core-all",
"junit",
],
static_libs: [
"core-tests-support",
],
- system_modules: "core-all-system-modules",
javacflags: ["-Xmaxwarns 9999999"],
// Pin java_version until jarjar is certified to support later versions. http://b/72703434
java_version: "1.8",
diff --git a/jdwp/Android.bp b/jdwp/Android.bp
index 3f40584..b1af1b5 100644
--- a/jdwp/Android.bp
+++ b/jdwp/Android.bp
@@ -22,11 +22,6 @@ java_test {
sdk_version: "none",
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"],
},