From 3e65155a1f6e2941b22833ee448a08a7c77b0182 Mon Sep 17 00:00:00 2001
From: evitayan <evitayan@google.com>
Date: Wed, 24 Jun 2020 14:35:01 -0700
Subject: Convert bouncycastle_ike_digests filegroup to java_library

Bug: 152328618
Bug: 159008684
Test: m droid
Change-Id: I7f4be8a1eb7aa84bc95068a044487b4c8b2c5464
Merged-In: I7f4be8a1eb7aa84bc95068a044487b4c8b2c5464
---
 Android.bp | 11 +++++++++--
 1 file 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",
 }
-- 
cgit v1.2.3