commit 4e3766612a8acde36193b736e6d7d2f5dcd281c8
author Narayan Kamath <narayan@google.com> Tue Feb 27 15:26:02 2018 +0000
committer Narayan Kamath <narayan@google.com> Thu Mar 01 12:41:34 2018 +0000
tree cf4c0f9e80627cf50b6f31270afff3cb05037cef
parent efc7448fc6dc0ac7af9a8b58b7e70290f9e2a21d

Switch bouncycastle-nojarjar -> bouncycastle-unbundled.

The nojarjar versions and unbundled versions are very similar
in terms of their content, they're just linked against different
sets of dependencies. Generally, there should be no downsides to
always linking against a public SDK given that BC has no
dependencies on private API.

Test: make
Bug: 73635411

Change-Id: Id5673d3c7bc0754a8c22787330781278f2390808

Android.bp

diff --git a/Android.bp b/Android.bp
index 8558259..8f1a364 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,7 +45,7 @@
 
 // non-jarjar version to build okhttp-tests
 java_library_static {
-    name: "bouncycastle-nojarjar",
+    name: "bouncycastle-unbundled",
     defaults: ["bouncycastle-defaults"],
 
     srcs: ["bcprov/src/main/java/**/*.java"],
@@ -53,7 +53,7 @@
         "bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java",
     ],
 
-    no_framework_libs: true,
+    sdk_version: "9",
     java_version: "1.7",
 }
 
@@ -61,7 +61,7 @@
     name: "bouncycastle",
     defaults: ["bouncycastle-defaults"],
 
-    static_libs: ["bouncycastle-nojarjar"],
+    static_libs: ["bouncycastle-unbundled"],
     no_framework_libs: true,
     java_version: "1.7",
 
@@ -79,45 +79,18 @@
     name: "bouncycastle-testdex",
     defaults: ["bouncycastle-defaults"],
 
-    static_libs: ["bouncycastle-nojarjar"],
+    static_libs: ["bouncycastle-unbundled"],
     no_framework_libs: true,
     jarjar_rules: "jarjar-rules.txt",
     java_version: "1.7",
 }
 
-// unbundled bouncycastle jar
-java_library_static {
-    name: "bouncycastle-unbundled",
-    defaults: [
-        "bouncycastle-errorprone-defaults",
-    ],
-
-    sdk_version: "9",
-    srcs: ["bcprov/src/main/java/**/*.java"],
-    exclude_srcs: [
-        "bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java",
-    ],
-}
-
 // PKIX classes used for testing
 java_library_static {
-    name: "bouncycastle-bcpkix-nojarjar",
-    defaults: ["bouncycastle-defaults"],
-
-    srcs: ["bcpkix/src/main/java/**/*.java"],
-    exclude_srcs: ["bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java"],
-    no_framework_libs: true,
-    java_version: "1.7",
-    libs: [
-        "bouncycastle-nojarjar",
-    ],
-}
-
-java_library_static {
     name: "bouncycastle-bcpkix",
     defaults: ["bouncycastle-defaults"],
 
-    static_libs: ["bouncycastle-bcpkix-nojarjar"],
+    static_libs: ["bouncycastle-bcpkix-unbundled"],
     no_framework_libs: true,
     java_version: "1.7",
 
@@ -128,33 +101,43 @@
     },
 }
 
-// OCSP classes used for testing
 java_library_static {
-    name: "bouncycastle-ocsp-nojarjar",
-    defaults: ["bouncycastle-defaults"],
-
-    srcs: [
-        "bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java",
-        "bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java",
+    name: "bouncycastle-bcpkix-unbundled",
+    defaults: [
+        "bouncycastle-defaults",
     ],
-    java_version: "1.7",
-    no_framework_libs: true,
-    libs: [
-        "bouncycastle-nojarjar",
-        "bouncycastle-bcpkix-nojarjar",
-    ],
+    libs: [ "bouncycastle-unbundled" ],
+    sdk_version: "9",
+    srcs: ["bcpkix/src/main/java/**/*.java"],
+    exclude_srcs: ["bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java"],
 }
 
+
+// OCSP classes used for testing
 java_library_static {
     name: "bouncycastle-ocsp",
     defaults: ["bouncycastle-defaults"],
 
-    static_libs: ["bouncycastle-ocsp-nojarjar"],
+    static_libs: ["bouncycastle-ocsp-unbundled"],
     jarjar_rules: "jarjar-rules.txt",
     java_version: "1.7",
     no_framework_libs: true,
 }
 
+java_library_static {
+    name: "bouncycastle-ocsp-unbundled",
+    defaults: [
+        "bouncycastle-defaults",
+    ],
+    libs: [ "bouncycastle-unbundled",
+            "bouncycastle-bcpkix-unbundled" ],
+    sdk_version: "9",
+    srcs: [
+        "bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java",
+        "bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java",
+    ],
+}
+
 // For compatibilityy with old bouncycastle-host and bouncycastle-bcpkix-host names
 java_library_host {
     name: "bouncycastle-host",