diff options
| author | Adam Vartanian <flooey@google.com> | 2017-03-27 13:18:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-27 13:18:40 +0000 |
| commit | 4c649ac7c1d1386aa0e53cf948c801c9649c9c98 (patch) | |
| tree | 8aa30fcf38eb956099a8d4ea0ec759caef0bd10a | |
| parent | 30e1519d967600221c4ee7e3c53bad5d546ff3b9 (diff) | |
| parent | 1187a7bf7b612a8c09b70e65ea52351a1c5c731b (diff) | |
| download | wycheproof-4c649ac7c1d1386aa0e53cf948c801c9649c9c98.tar.gz | |
Change Wycheproof makefile to use jarjared rules am: 24b0fdaed8
am: 1187a7bf7b
Change-Id: I42d1c4dbef6167a450b3e4cc437663632d462af6
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | java/com/google/security/wycheproof/BouncyCastleAllTests.java | 3 | ||||
| -rw-r--r-- | java/com/google/security/wycheproof/BouncyCastleTest.java | 3 | ||||
| -rw-r--r-- | java/com/google/security/wycheproof/ConscryptTest.java | 3 |
4 files changed, 7 insertions, 4 deletions
@@ -23,7 +23,7 @@ LOCAL_MODULE := wycheproof LOCAL_MODULE_TAGS := optional LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_SRC_FILES := $(supported_wycheproof_files) -LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt-nojarjar bouncycastle-nojarjar junit +LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt bouncycastle junit include $(BUILD_STATIC_JAVA_LIBRARY) all_wycheproof_files := 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; diff --git a/java/com/google/security/wycheproof/BouncyCastleTest.java b/java/com/google/security/wycheproof/BouncyCastleTest.java index 941b94f..6fd118c 100644 --- a/java/com/google/security/wycheproof/BouncyCastleTest.java +++ b/java/com/google/security/wycheproof/BouncyCastleTest.java @@ -19,7 +19,8 @@ package com.google.security.wycheproof; import com.google.security.wycheproof.WycheproofRunner.Fast; 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; diff --git a/java/com/google/security/wycheproof/ConscryptTest.java b/java/com/google/security/wycheproof/ConscryptTest.java index c4f58d5..2a87a7b 100644 --- a/java/com/google/security/wycheproof/ConscryptTest.java +++ b/java/com/google/security/wycheproof/ConscryptTest.java @@ -19,7 +19,8 @@ package com.google.security.wycheproof; import com.google.security.wycheproof.WycheproofRunner.Fast; import com.google.security.wycheproof.WycheproofRunner.Provider; import com.google.security.wycheproof.WycheproofRunner.ProviderType; -import org.conscrypt.OpenSSLProvider; +// Android-changed: Update import to account for jarjar +import com.android.org.conscrypt.OpenSSLProvider; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; |