commit 0c13c7332ce3fb1c8fb59d88ec95d8f3b5602b34
author Neil Fuller <nfuller@google.com> Thu Oct 11 08:35:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 11 08:35:59 2018 +0000
tree e4854f653545b06908e7134e23898bdcedd69291
parent 8efdf576d81889f50b49ac8eb8e29577f48c37c8
parent 1f00f0e3e73019764f51e7dd34e818eab2052e95

Merge "Explicitly compile against core-all"

Android.bp

diff --git a/Android.bp b/Android.bp
index 6fa9b5e..5ecfc20 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,7 +78,11 @@
 
     srcs: [":bouncycastle_java_files"],
 
-    no_framework_libs: true,
+    no_standard_libs: true,
+    libs: [
+        "core-all",
+    ],
+    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -92,7 +96,11 @@
 
     srcs: [":bouncycastle_java_files"],
 
-    no_framework_libs: true,
+    no_standard_libs: true,
+    libs: [
+        "core-all",
+    ],
+    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -104,9 +112,13 @@
 
     srcs: ["android_bcpkix/src/main/java/**/*.java"],
     exclude_srcs: ["android_bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java"],
-    libs: ["bouncycastle"],
 
-    no_framework_libs: true,
+    no_standard_libs: true,
+    libs: [
+        "core-all",
+        "bouncycastle",
+    ],
+    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }
 
@@ -136,7 +148,12 @@
         "android_bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java",
     ],
 
-    no_framework_libs: true,
+    no_standard_libs: true,
+    libs: [
+        "core-all",
+        "bouncycastle",
+    ],
+    system_modules: "core-all-system-modules",
     java_version: "1.7",
 }