Merge "Run wycheproof tests against unbundled version of BouncyCastle" am: 6d3f046ff9 am: fbcaf9f3c8 am: 479ec25490
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1572480
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d756d6750f07ce2c8e4732bb6c9c7e4b645b06a
diff --git a/Android.bp b/Android.bp
index bcb5369..f379214 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,9 +43,9 @@
"java/com/google/security/wycheproof/SpongyCastleTest.java",
"java/com/google/security/wycheproof/SpongyCastleAllTests.java",
],
- sdk_version: "none",
- system_modules: "legacy-art-module-platform-api-stubs-system-modules",
+ sdk_version: "current",
libs: [
+ "bouncycastle-repackaged-unbundled",
"conscrypt.module.platform.api",
"junit",
],
diff --git a/java/com/google/security/wycheproof/BouncyCastleAllTests.java b/java/com/google/security/wycheproof/BouncyCastleAllTests.java
index 2ce1290..67de46d 100644
--- a/java/com/google/security/wycheproof/BouncyCastleAllTests.java
+++ b/java/com/google/security/wycheproof/BouncyCastleAllTests.java
@@ -19,7 +19,7 @@
import com.google.security.wycheproof.WycheproofRunner.Provider;
import com.google.security.wycheproof.WycheproofRunner.ProviderType;
// Android-changed: Update import to account for jarjar
-import com.android.org.bouncycastle.jce.provider.BouncyCastleProvider;
+import com.android.internal.org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/java/com/google/security/wycheproof/BouncyCastleTest.java b/java/com/google/security/wycheproof/BouncyCastleTest.java
index c5beb94..2da6bb8 100644
--- a/java/com/google/security/wycheproof/BouncyCastleTest.java
+++ b/java/com/google/security/wycheproof/BouncyCastleTest.java
@@ -20,7 +20,7 @@
import com.google.security.wycheproof.WycheproofRunner.Provider;
import com.google.security.wycheproof.WycheproofRunner.ProviderType;
// Android-changed: Update import to account for jarjar
-import com.android.org.bouncycastle.jce.provider.BouncyCastleProvider;
+import com.android.internal.org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;