diff options
| author | Daulet Zhanguzin <dauletz@google.com> | 2021-02-03 12:10:46 +0000 |
|---|---|---|
| committer | Daulet Zhanguzin <dauletz@google.com> | 2021-02-03 12:10:46 +0000 |
| commit | 8c3e089df0baf7f7cd9ca4a23f69ef6e9535c4bd (patch) | |
| tree | ec85bcc16e2eefcff90c5d8d5a75464428414639 | |
| parent | 7f8ed30017f980f6b230063a95f52a1a1eac6787 (diff) | |
| download | wycheproof-8c3e089df0baf7f7cd9ca4a23f69ef6e9535c4bd.tar.gz | |
Run wycheproof tests against unbundled version of BouncyCastle
Test: Treehugger
Change-Id: I4439fb6b1052d15589bad359d1e5cb447cdc8223
| -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
@@ -29,9 +29,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; |