From bb540131b77a0eee1e4edbaf1e9952a232212784 Mon Sep 17 00:00:00 2001
From: Daulet Zhanguzin <dauletz@google.com>
Date: Wed, 24 Feb 2021 12:58:21 +0000
Subject: [PATCH] Use unbundled version of BouncyCastle in Ike cts tests

Since BouncyCastle APIs provided by platform vary, use unbundled
BouncyCastle

Fixes: 180870458
Test: atest CtsNetTestCases
Change-Id: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
---
 tests/cts/net/Android.bp                            | 1 +
 tests/cts/net/src/android/net/cts/Ikev2VpnTest.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index 13b5e9a94f..bbfb2c11b2 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -41,6 +41,7 @@ java_defaults {
     ],
     jarjar_rules: "jarjar-rules-shared.txt",
     static_libs: [
+        "bouncycastle-unbundled",
         "FrameworksNetCommonTests",
         "TestNetworkStackLib",
         "core-tests-support",
diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
index 8f2d93d9aa..c6d8d65bb4 100644
--- a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
+++ b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
@@ -55,10 +55,10 @@ import android.platform.test.annotations.AppModeFull;
 import androidx.test.InstrumentationRegistry;
 
 import com.android.internal.util.HexDump;
-import com.android.internal.org.bouncycastle.x509.X509V1CertificateGenerator;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
 import com.android.testutils.DevSdkIgnoreRunner;
 
+import org.bouncycastle.x509.X509V1CertificateGenerator;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;