android: always build libssl and libcrypto

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 7c9d1349147e90a0dd7d3251dfd5707c1142ccb5..77e2d502d806687ffc34b481a1fd2b4f6c8aed5b 100755 (executable)
--- 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