Snap for 6639787 from 3e65155a1f6e2941b22833ee448a08a7c77b0182 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: I93d6efd6be335da52a1cb0866315c18df8a384b8

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",
 }