diff options
| author | Daulet Zhanguzin <dauletz@google.com> | 2021-02-11 14:44:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-11 14:44:06 +0000 |
| commit | 6d3f046ff9ea2b6fdacf319ec0453638da1fecc8 (patch) | |
| tree | c184b5392ea92544d6c05fac120fc540ade597d8 | |
| parent | d43f2886cc86ff3f9408828e8a366e7e7f2059be (diff) | |
| parent | 8c3e089df0baf7f7cd9ca4a23f69ef6e9535c4bd (diff) | |
| download | wycheproof-6d3f046ff9ea2b6fdacf319ec0453638da1fecc8.tar.gz | |
Merge "Run wycheproof tests against unbundled version of BouncyCastle"android-s-preview-1
| -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; |