Convert bouncycastle_ike_digests filegroup to java_library

Bug: 152328618
Test: m droid
Change-Id: I7f4be8a1eb7aa84bc95068a044487b4c8b2c5464

1 files changed, 9 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 5c7488f0..8a5cdd93 100644
--- a/Android.bp
+++ b/Android.bp
@@ -187,13 +187,19 @@ java_library_host {
     static_libs: ["bouncycastle-unbundled"],
 }
 
-// Bouncycastle filegroup for use by frameworks/opt/net/ike project.
+// Bouncycastle subset for use by frameworks/opt/net/ike project.
+//
+// Avoids including the whole of bouncycastle_unbundled in ike.
 //
 // 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: ["//frameworks/opt/net/ike"],
+    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",
@@ -204,4 +210,5 @@ filegroup {
         "bcprov/src/main/java/org/bouncycastle/util/Memoable.java",
         "bcprov/src/main/java/org/bouncycastle/util/Pack.java",
     ],
+    sdk_version: "core_current",
 }