]> sjero.net Git - linphone/commitdiff
android: update build file (libssl enabled)
authorPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Wed, 20 Jul 2011 13:28:54 +0000 (15:28 +0200)
committerPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Wed, 20 Jul 2011 13:28:54 +0000 (15:28 +0200)
build/android/Android.mk

index 77e2d502d806687ffc34b481a1fd2b4f6c8aed5b..817ed9155c18978d8c366b0a00c083248509f78a 100755 (executable)
@@ -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
-
-ifeq ($(BUILD_SRTP),1)
-LOCAL_SHARED_LIBRARIES += \
-       libsrtp
-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
 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