Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use shared library arch ABI suffixes.

Browse source
This commit is contained in:
Ghislain MARY 2013-10-03 17:36:43 +02:00
parent 0a8018e9b2
commit 72964060da
4 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/Application.mk
View file

@ -94,7 +94,7 @@ APP_MODULES += libtunnelclient
endif endif
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
APP_MODULES += liblincrypto liblinssl APP_MODULES += libcrypto-linphone libssl-linphone
APP_MODULES += libzrtpcpp APP_MODULES += libzrtpcpp
endif endif

13
submodules/externals/build/libzrtpcpp/Android.mk vendored
View file

@ -64,16 +64,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_EXTERNALS)/openssl/include $(LOCAL_EXTERNALS)/openssl/include
# Build dynamic and static versions
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE := libzrtpcpp LOCAL_MODULE := libzrtpcpp
LOCAL_SHARED_LIBRARIES := liblinssl liblincrypto LOCAL_MODULE_FILENAME := libzrtpcpp-$(TARGET_ARCH_ABI)
LOCAL_SHARED_LIBRARIES := libssl-linphone libcrypto-linphone
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
else
LOCAL_STATIC_LIBRARIES := libssl-static libcrypto-static
LOCAL_MODULE:= libzrtpcpp-static
include $(BUILD_STATIC_LIBRARY)
endif

14
submodules/externals/build/srtp/Android.mk vendored
View file

@ -50,17 +50,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/crypto/include $(LOCAL_PATH)/crypto/include
LOCAL_MODULE := libsrtp
LOCAL_MODULE_FILENAME := libsrtp-$(TARGET_ARCH_ABI)
# Build dynamic and static versions
ifeq ($(TARGET_ARCH), x86)
LOCAL_MODULE:= libsrtp
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
else
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE:= libsrtp
include $(BUILD_SHARED_LIBRARY)
else
LOCAL_MODULE:= libsrtp-static
include $(BUILD_STATIC_LIBRARY)
endif
endif

2
submodules/linphone

@ -1 +1 @@
Subproject commit 946bb087335a6602fcbb1ae08b6ca707653617b4 Subproject commit 9680b2915adcb22a1d14a7c2c7b691c49fa91a3a