commit 2b7f3068ef13973fb04885c2352a0f0883070efb
author Narayan Kamath <narayan@google.com> Fri Mar 02 11:10:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 02 11:10:13 2018 +0000
tree dbf5ff33dea12e8b7ef144687a1f523338d2746f
parent 7e5fb7c809ec5f7130e94a54f7c08b9bfa035de4
parent eaa601ad1ba30f1f43197fe51c8b30a3e1a682d0

Merge "Track renaming of bouncycastle-nojarjar -> bouncycastle-unbundled."

Android.mk

diff --git a/Android.mk b/Android.mk
index d76f5ef..da82f2d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -77,9 +77,9 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
     core-tests-support \
     conscrypt-nojarjar \
-    bouncycastle-nojarjar \
-    bouncycastle-bcpkix-nojarjar \
-    bouncycastle-ocsp-nojarjar
+    bouncycastle-unbundled \
+    bouncycastle-bcpkix-unbundled \
+    bouncycastle-ocsp-unbundled
 LOCAL_JAVACFLAGS := $(local_javac_flags)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := conscrypt-tests
@@ -102,9 +102,9 @@
     core-oj \
     core-libart \
     junit \
-    bouncycastle-nojarjar \
-    bouncycastle-bcpkix-nojarjar \
-    bouncycastle-ocsp-nojarjar \
+    bouncycastle-unbundled \
+    bouncycastle-bcpkix-unbundled \
+    bouncycastle-ocsp-unbundled \
     caliper-api-target
 LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support conscrypt-nojarjar
 LOCAL_JAVACFLAGS := $(local_javac_flags)
@@ -128,9 +128,9 @@
     LOCAL_SRC_FILES := $(bundled_test_java_files)
     LOCAL_JAVA_RESOURCE_DIRS := openjdk/src/test/resources openjdk-integ-tests/src/test/resources
     LOCAL_JAVA_LIBRARIES := \
-        bouncycastle-nojarjar-hostdex \
-        bouncycastle-bcpkix-nojarjar-hostdex \
-        bouncycastle-ocsp-nojarjar-hostdex \
+        bouncycastle-unbundled-hostdex \
+        bouncycastle-bcpkix-unbundled-hostdex \
+        bouncycastle-ocsp-unbundled-hostdex \
         junit-hostdex \
         core-tests-support-hostdex \
         mockito-api-hostdex