diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-09-20 14:41:55 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2019-09-20 14:41:55 +0100 |
| commit | aac480fae7186a435089c45fd22dde9b609304c3 (patch) | |
| tree | 420e7501f6c27db2fb2897e68632b96025117fa6 | |
| parent | 1acb5e534b172f66172532135567fc4123b7924f (diff) | |
| download | apache-harmony-aac480fae7186a435089c45fd22dde9b609304c3.tar.gz | |
Remove duplicate libraries that are provided by system modules
An improvement in the Soong build means that it is no longer necessary
to duplicate the libraries that it provides. This change removes the
duplicates and moves the system_modules property next to sdk_version
property to be consistent and because those properties are tightly
coupled.
Bug: 141359858
Test: m checkbuild
Change-Id: I16379e814ea5805ffbce74a86c2441028540a2d6
| -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"], }, |