diff options
author | Daulet Zhanguzin <dauletz@google.com> | 2021-02-11 15:05:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-11 15:05:16 +0000 |
commit | fbcaf9f3c8ba72aec7701a09e39be794506e04fe (patch) | |
tree | c184b5392ea92544d6c05fac120fc540ade597d8 | |
parent | 760adb131f5ae3e3164813db38861083751789e6 (diff) | |
parent | 6d3f046ff9ea2b6fdacf319ec0453638da1fecc8 (diff) | |
download | wycheproof-fbcaf9f3c8ba72aec7701a09e39be794506e04fe.tar.gz |
Merge "Run wycheproof tests against unbundled version of BouncyCastle" am: 6d3f046ff9android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1572480
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5322502910d61e01aa648025a9bd7cfea03afd8
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | java/com/google/security/wycheproof/BouncyCastleAllTests.java | 2 | ||||
-rw-r--r-- | java/com/google/security/wycheproof/BouncyCastleTest.java | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -43,9 +43,9 @@ java_library_static { "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 @@ package com.google.security.wycheproof; 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.Fast; 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; |