Change Wycheproof makefile to use jarjared rules am: 24b0fdaed8 am: 1187a7bf7b
am: 4c649ac7c1
Change-Id: Iacd603bcc5b65b052877ee9d678e833d76b7e516
diff --git a/Android.mk b/Android.mk
index 421d3cf..144d8b3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,7 +23,7 @@
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 @@
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 @@
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 @@
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;
