commit c56d7050362a461e413734af327cfc62f89c3db2
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 23 14:25:35 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 23 14:25:35 2019 +0000
tree d7ab49eb3d5da925db00e54a5136170933c787a2
parent d650f3b3aa8d7cd613b4b2b4244785349d608447
parent 6461a1b131900d7750c1fdb43096eebb0a1f49cd

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 345813a..c0314a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,12 +47,11 @@
     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 @@
     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 @@
     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 @@
     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",
 }