commit 9b30eb05e5be69d51881a0d1b31e503e97acd784
author Narayan Kamath <narayan@google.com> Wed Dec 30 11:43:35 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 30 11:43:35 2015 +0000
tree b5eb091b97b2aade28e5b45a15352125a4a776d7
parent 81cafc9f97b8e277c1f2faa0f2930d1c8481cbeb
parent 372845f30cce079c28a722cc5dec79997ab459f2

Merge "Add core-oj to the list of dependencies"

Android.mk

diff --git a/Android.mk b/Android.mk
index b531ac8..04a6b25 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,7 +38,7 @@
     LOCAL_MODULE := bouncycastle
     LOCAL_MODULE_TAGS := optional
     LOCAL_SRC_FILES := $(android_bcprov_src_files)
-    LOCAL_JAVA_LIBRARIES := core-libart conscrypt
+    LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt
     LOCAL_NO_STANDARD_LIBRARIES := true
     LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -49,7 +49,7 @@
     LOCAL_MODULE := bouncycastle-nojarjar
     LOCAL_MODULE_TAGS := optional
     LOCAL_SRC_FILES := $(android_bcprov_src_files)
-    LOCAL_JAVA_LIBRARIES := core-libart conscrypt
+    LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt
     LOCAL_NO_STANDARD_LIBRARIES := true
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
     include $(BUILD_STATIC_JAVA_LIBRARY)