Create java library for repackaged bouncycastle in com.android.internal namespace

Bug: 154796679
Test: TH

Change-Id: I6d21c4ca4bdba0e0abaa9e0a8a0dae0106db5347

1 files changed, 17 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 777a5269..615155c6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,7 +57,7 @@ filegroup {
 }
 
 // A bouncycastle library repackaged in com.android.org.bouncycastle for use
-// in the Android platform where it is important not to conflict with the
+// in the ART module. Repackaging is needed to avoid conflict with the
 // original org.bouncycastle package.
 java_library {
     name: "bouncycastle",
@@ -84,6 +84,22 @@ java_library {
     system_modules: "art-module-intra-core-api-stubs-system-modules",
 }
 
+// A bouncycastle library repackaged in com.android.internal.org.bouncycastle
+// for use in the Android platform where it is important not to conflict with
+// the original org.bouncycastle package or the one in the ART module.
+java_library {
+    name: "bouncycastle-repackaged-unbundled",
+    visibility: [
+        "//external/sl4a/Common",
+        "//frameworks/base",
+        "//frameworks/base/tests/net",
+    ],
+    defaults: ["bouncycastle-defaults"],
+    installable: true,
+    sdk_version: "core_current",
+    srcs: ["repackaged_platform/bcprov/src/main/java/**/*.java"],
+}
+
 unbundled_visibility = [
     "//art/build/sdk",
     "//build/make/tools/signapk",