diff options
| author | Adam Vartanian <flooey@google.com> | 2017-03-27 11:29:26 +0100 |
|---|---|---|
| committer | Adam Vartanian <flooey@google.com> | 2017-03-27 11:33:18 +0100 |
| commit | 24b0fdaed8992cd9c585ab4c397226c2d7a2dd1f (patch) | |
| tree | 8aa30fcf38eb956099a8d4ea0ec759caef0bd10a /java/com/google/security/wycheproof/BouncyCastleAllTests.java | |
| parent | 39766076a3426b06d22302627cb55409ab043b61 (diff) | |
| download | wycheproof-24b0fdaed8992cd9c585ab4c397226c2d7a2dd1f.tar.gz | |
Change Wycheproof makefile to use jarjared rules
Since these tests have to run using the version installed on a device,
we need to use the jarjared rules, since we jarjar the libraries
that are installed on the devices.
Bug: 31182886
Test: vogar com.google.security.wycheproof.ConscryptTest
Change-Id: I7f87541ec52fe8a8cd3f32fc9927e34ae2d3d772
Diffstat (limited to 'java/com/google/security/wycheproof/BouncyCastleAllTests.java')
| -rw-r--r-- | java/com/google/security/wycheproof/BouncyCastleAllTests.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/com/google/security/wycheproof/BouncyCastleAllTests.java b/java/com/google/security/wycheproof/BouncyCastleAllTests.java index 47a4dcf..7bf5792 100644 --- a/java/com/google/security/wycheproof/BouncyCastleAllTests.java +++ b/java/com/google/security/wycheproof/BouncyCastleAllTests.java @@ -18,7 +18,8 @@ package com.google.security.wycheproof; import com.google.security.wycheproof.WycheproofRunner.Provider; import com.google.security.wycheproof.WycheproofRunner.ProviderType; -import org.bouncycastle.jce.provider.BouncyCastleProvider; +// Android-changed: Update import to account for jarjar +import com.android.org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; |