aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Vartanian <flooey@google.com>2017-03-27 13:15:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-27 13:15:40 +0000
commit1187a7bf7b612a8c09b70e65ea52351a1c5c731b (patch)
tree8aa30fcf38eb956099a8d4ea0ec759caef0bd10a
parent897f4366aa2a06bdb9bb2fdaeda31efed64c4deb (diff)
parent24b0fdaed8992cd9c585ab4c397226c2d7a2dd1f (diff)
downloadwycheproof-1187a7bf7b612a8c09b70e65ea52351a1c5c731b.tar.gz
Change Wycheproof makefile to use jarjared rulesandroid-o-iot-preview-5o-iot-preview-5
am: 24b0fdaed8 Change-Id: I5331ca0554a9bd9b9ecec15cc74e69a9333e3c20
-rw-r--r--Android.mk2
-rw-r--r--java/com/google/security/wycheproof/BouncyCastleAllTests.java3
-rw-r--r--java/com/google/security/wycheproof/BouncyCastleTest.java3
-rw-r--r--java/com/google/security/wycheproof/ConscryptTest.java3
4 files changed, 7 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 421d3cf..144d8b3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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;