summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-10-02 02:55:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-02 02:55:12 +0000
commit13c5c066f4b4f2b4cd2afa2b73ea828099761844 (patch)
treeb7dfad82930641b8436db6e4382d54edafa7615d
parent800d4b54cbce08c54502227300c365aa3ac76b70 (diff)
parent5b5f3234fcff6346ccef55d79afb0ba956860cae (diff)
downloadlibcore-13c5c066f4b4f2b4cd2afa2b73ea828099761844.zip
libcore-13c5c066f4b4f2b4cd2afa2b73ea828099761844.tar.gz
libcore-13c5c066f4b4f2b4cd2afa2b73ea828099761844.tar.bz2
Merge "Conscrypt: add missing libraries to JNI lib"
-rw-r--r--crypto/Android.mk2
1 files changed, 1 insertions, 1 deletions
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 @@ ifeq ($(WITH_HOST_DALVIK),true)
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