commit bb540131b77a0eee1e4edbaf1e9952a232212784
author Daulet Zhanguzin <dauletz@google.com> Wed Feb 24 12:58:21 2021 +0000
committer Daulet Zhanguzin <dauletz@google.com> Wed Feb 24 13:09:36 2021 +0000
tree 0eb4d4ff04a2fb6d7680369cf4bbac41d29c5363
parent ffb0ccd04bc3505f20827a0bfcf7a7060dfd4d89

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

diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index 13b5e9a..bbfb2c1 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -41,6 +41,7 @@
     ],
     jarjar_rules: "jarjar-rules-shared.txt",
     static_libs: [
+        "bouncycastle-unbundled",
         "FrameworksNetCommonTests",
         "TestNetworkStackLib",
         "core-tests-support",

tests/cts/net/src/android/net/cts/Ikev2VpnTest.java

diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
index 8f2d93d..c6d8d65 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 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;