From a1f54297c7700ff80c20af25492115c3e26ed2fa Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 20 Jul 2011 12:03:59 +0200 Subject: [PATCH] android: always build libssl and libcrypto --- build/android/Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index 7c9d13491..77e2d502d 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -114,7 +114,6 @@ LOCAL_SHARED_LIBRARIES += \ libavutil endif - LOCAL_STATIC_LIBRARIES += libspeex @@ -128,6 +127,8 @@ LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES) endif ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +LOCAL_SHARED_LIBRARIES += \ + liblinssl liblincrypto ifeq ($(BUILD_GPLV3_ZRTP),1) LOCAL_SHARED_LIBRARIES += \ libzrtpcpp @@ -137,6 +138,9 @@ ifeq ($(BUILD_SRTP),1) LOCAL_SHARED_LIBRARIES += \ libsrtp endif +else +LOCAL_STATIC_LIBRARIES += \ + libssl-static libcrypto-static endif LOCAL_MODULE := liblinphone