diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-09-23 08:12:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-23 08:12:14 -0700 |
| commit | 8a0b5e9ca51063573294ad4c4fae604246599c52 (patch) | |
| tree | 420e7501f6c27db2fb2897e68632b96025117fa6 | |
| parent | c6714ffc6e04b7f92f2bcd22836bb4895eb3444f (diff) | |
| parent | 3d2e32604acc558eb3d69c267dc69e84a3840abb (diff) | |
| download | apache-harmony-8a0b5e9ca51063573294ad4c4fae604246599c52.tar.gz | |
Merge "Remove duplicate libraries that are provided by system modules" am: fcbda2c11b am: 812d80ab6a am: 75524c2fab
am: 3d2e32604a
Change-Id: I755520c6472c67ae54440b23e7e41fc8eefbf92e
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | jdwp/Android.bp | 5 |
2 files changed, 1 insertions, 7 deletions
@@ -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"], }, |