From 9a357a92a2cfeecfb0425a8da3780f73a9549ac0 Mon Sep 17 00:00:00 2001
From: Daulet Zhanguzin <dauletz@google.com>
Date: Mon, 25 Jan 2021 19:43:53 +0000
Subject: [PATCH] Update frameworks to use unbundled version of BouncyCastle.

Previously BouncyCastle methods were exposed as libcore APIs (@CorePlatformApi), which no longer possible when ART is updatable module (and can't guarantee BouncyCastle API stability)

Bug: 154796679
Test: Treehugger

Change-Id: I908681841a6766de88761767c77c4e2d4b5f56d5
---
 tests/net/Android.bp                                | 1 +
 tests/net/java/android/net/Ikev2VpnProfileTest.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/net/Android.bp b/tests/net/Android.bp
index f6a2846c9b..e630da04a5 100644
--- a/tests/net/Android.bp
+++ b/tests/net/Android.bp
@@ -53,6 +53,7 @@ android_test {
     jarjar_rules: "jarjar-rules.txt",
     static_libs: [
         "androidx.test.rules",
+        "bouncycastle-repackaged-unbundled",
         "FrameworksNetCommonTests",
         "frameworks-base-testutils",
         "frameworks-net-integration-testutils",
diff --git a/tests/net/java/android/net/Ikev2VpnProfileTest.java b/tests/net/java/android/net/Ikev2VpnProfileTest.java
index 076e41d33a..1abd39a32b 100644
--- a/tests/net/java/android/net/Ikev2VpnProfileTest.java
+++ b/tests/net/java/android/net/Ikev2VpnProfileTest.java
@@ -30,7 +30,7 @@ import androidx.test.runner.AndroidJUnit4;
 
 import com.android.internal.net.VpnProfile;
 import com.android.net.module.util.ProxyUtils;
-import com.android.org.bouncycastle.x509.X509V1CertificateGenerator;
+import com.android.internal.org.bouncycastle.x509.X509V1CertificateGenerator;
 
 import org.junit.Before;
 import org.junit.Test;