Merge "Remove duplicate libraries that are provided by system modules"

1 files changed, 4 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 345813a..c0314a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,12 +47,11 @@ java_library {
     hostdex: true,
 
     sdk_version: "none",
+    system_modules: "core-all-system-modules",
     libs: [
-        "core-all",
         // TODO(b/129126571): Depend on Conscrypt stubs instead
         "conscrypt",
     ],
-    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -78,12 +77,11 @@ java_library {
     installable: true,
 
     sdk_version: "none",
+    system_modules: "core-all-system-modules",
     libs: [
-        "core-all",
         // TODO(b/129126571): Depend on Conscrypt stubs instead
         "conscrypt",
     ],
-    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -100,15 +98,14 @@ java_library {
     installable: true,
 
     sdk_version: "none",
+    system_modules: "core-all-system-modules",
     libs: [
-        "core-all",
         // TODO(b/129126571): Depend on Conscrypt stubs instead
         "conscrypt",
     ],
     dex_preopt: {
         enabled: false,
     },
-    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -131,14 +128,13 @@ java_library {
     exclude_srcs: ["okhttp-tests/src/test/java/com/squareup/okhttp/WebPlatformUrlTest.java"],
 
     sdk_version: "none",
+    system_modules: "core-all-system-modules",
     libs: [
-        "core-all",
         "okhttp-nojarjar",
         "junit",
         "conscrypt",
         "bouncycastle-unbundled",
     ],
-    system_modules: "core-all-system-modules",
 
     java_version: "1.7",
 }