commit 9a357a92a2cfeecfb0425a8da3780f73a9549ac0
author Daulet Zhanguzin <dauletz@google.com> Mon Jan 25 19:43:53 2021 +0000
committer Daulet Zhanguzin <dauletz@google.com> Thu Jan 28 07:51:22 2021 +0000
tree 46e2a52505ff9041b01416560e9c0bea6bec95ca
parent 2b5f97052970b2b70b2128bde9617956c2ede9e8

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

diff --git a/tests/net/Android.bp b/tests/net/Android.bp
index f6a2846..e630da0 100644
--- a/tests/net/Android.bp
+++ b/tests/net/Android.bp
@@ -53,6 +53,7 @@
     jarjar_rules: "jarjar-rules.txt",
     static_libs: [
         "androidx.test.rules",
+        "bouncycastle-repackaged-unbundled",
         "FrameworksNetCommonTests",
         "frameworks-base-testutils",
         "frameworks-net-integration-testutils",

tests/net/java/android/net/Ikev2VpnProfileTest.java

diff --git a/tests/net/java/android/net/Ikev2VpnProfileTest.java b/tests/net/java/android/net/Ikev2VpnProfileTest.java
index 076e41d..1abd39a 100644
--- a/tests/net/java/android/net/Ikev2VpnProfileTest.java
+++ b/tests/net/java/android/net/Ikev2VpnProfileTest.java
@@ -30,7 +30,7 @@
 
 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;