android: always build libssl and libcrypto

This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-07-20 12:03:59 +02:00
parent ff7f866dd9
commit a1f54297c7

View file

@ -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