diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-12 02:06:02 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-12 02:06:02 +0000 |
| commit | d80bc0bca382d9d606b4ac2ec53fc695bc95b2ac (patch) | |
| tree | c184b5392ea92544d6c05fac120fc540ade597d8 | |
| parent | cf956855febd68a7222fce9dc9122d3c704a35ef (diff) | |
| parent | 5efa3e20988971391236852198ec08ba0e1f5c91 (diff) | |
| download | wycheproof-android12-d1-s1-release.tar.gz | |
Snap for 7140885 from 5efa3e20988971391236852198ec08ba0e1f5c91 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: Ie8ad8b7af6de549bc009b5c3732a7e4b57ee1181
| -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; |