Snap for 6639677 from d88061d7ff04987d2203b8fd13f19e423e44d095 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release

Change-Id: Ic8dbc142f96b557c12393777bd0f99c95a2692ae

1 files changed, 9 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 035eadf9..b06e0b93 100644
--- a/Android.bp
+++ b/Android.bp
@@ -185,13 +185,19 @@ java_library_host {
     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 @@ filegroup {
         "bcprov/src/main/java/org/bouncycastle/util/Memoable.java",
         "bcprov/src/main/java/org/bouncycastle/util/Pack.java",
     ],
+    sdk_version: "core_current",
 }