From 11aeb96df5920cebbc95584ac17cb709cba37a8f Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 20 Jul 2011 15:28:54 +0200 Subject: [PATCH] android: update build file (libssl enabled) --- build/android/Android.mk | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index 77e2d502d..817ed9155 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -127,20 +127,22 @@ 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 -endif + LOCAL_SHARED_LIBRARIES += \ + liblinssl liblincrypto + ifeq ($(BUILD_GPLV3_ZRTP),1) + LOCAL_SHARED_LIBRARIES += \ + libzrtpcpp + endif -ifeq ($(BUILD_SRTP),1) -LOCAL_SHARED_LIBRARIES += \ - libsrtp -endif + ifeq ($(BUILD_SRTP),1) + LOCAL_SHARED_LIBRARIES += \ + libsrtp + endif else -LOCAL_STATIC_LIBRARIES += \ - libssl-static libcrypto-static + LOCAL_LDLIBS += -lz + #LOCAL_STATIC_LIBRARIES += libz libdl + LOCAL_STATIC_LIBRARIES += \ + libssl-static libcrypto-static endif LOCAL_MODULE := liblinphone