commit 4bc9e6ac74bab2c5aa00d592671088a0c45e2322
author evitayan <evitayan@google.com> Mon Jun 29 21:17:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 29 21:17:23 2020 +0000
tree 4085ffc4f88b95ab5d169a27aeb07b165d20e7c7
parent c04d275d27064e520e1c2803598a73f8a88c9f8d
parent d88061d7ff04987d2203b8fd13f19e423e44d095

Convert bouncycastle_ike_digests filegroup to java_library am: 3e65155a1f am: d88061d7ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bouncycastle/+/11995758

Change-Id: I63858c2bce97ba16d92816c315e469c818588bcb

Android.bp

diff --git a/Android.bp b/Android.bp
index 035eadf..b06e0b9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -185,13 +185,19 @@
     static_libs: ["bouncycastle-unbundled"],
 }
 
-// Bouncycastle filegroup for use by platform/packages/modules/IPsec project.
+// Bouncycastle subset for use by platform/packages/modules/IPsec project.
+//
+// Avoids including the whole of bouncycastle_unbundled in IPsec.
 //
 // Specifically, SHA1Digest and MD4Digest (and their dependencies) must be used by IKEv2 to support
 // legacy authentication methods.
-filegroup {
+java_library {
     name: "bouncycastle_ike_digests",
     visibility: ["//packages/modules/IPsec"],
+    apex_available: [
+        "com.android.ipsec",
+        "test_com.android.ipsec",
+    ],
     srcs: [
         "bcprov/src/main/java/org/bouncycastle/crypto/Digest.java",
         "bcprov/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java",
@@ -202,4 +208,5 @@
         "bcprov/src/main/java/org/bouncycastle/util/Memoable.java",
         "bcprov/src/main/java/org/bouncycastle/util/Pack.java",
     ],
+    sdk_version: "core_current",
 }