commit c1e8aa4b8f60ba83ad74c3387fcef4ed52bfb017
author Kenny Root <kroot@google.com> Tue Oct 01 19:58:46 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 01 19:58:46 2013 -0700
tree 79de8bb02259d83a7330351743d677028fa9adfe
parent 88a8766a3a3edbe33e190542092b6519e1540af3
parent 13c5c066f4b4f2b4cd2afa2b73ea828099761844

am 13c5c066: Merge "Conscrypt: add missing libraries to JNI lib"

* commit '13c5c066f4b4f2b4cd2afa2b73ea828099761844':
  Conscrypt: add missing libraries to JNI lib

crypto/Android.mk

diff --git a/crypto/Android.mk b/crypto/Android.mk
index e2af290..cb71664 100644
--- a/crypto/Android.mk
+++ b/crypto/Android.mk
@@ -184,6 +184,6 @@
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := libconscrypt_jni
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-    LOCAL_SHARED_LIBRARIES := libcrypto-host libjavacore libssl-host
+    LOCAL_SHARED_LIBRARIES := libcrypto-host libjavacore liblog libnativehelper libssl-host
     include $(BUILD_HOST_SHARED_LIBRARY)
 endif