witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Use shared library arch ABI suffixes on Android.

Browse source
This commit is contained in:
Ghislain MARY 2013-10-03 17:33:16 +02:00
parent 946bb08733
commit 9680b2915a
3 changed files with 10 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
build/android/common.mk
View file

@ -184,40 +184,13 @@ LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES)
LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
LOCAL_SRC_FILES += $(LIBLINPHONE_EXTENDED_SRC_FILES)
ifeq ($(TARGET_ARCH), arm)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
LOCAL_SHARED_LIBRARIES += libzrtpcpp
endif
ifeq ($(BUILD_SRTP),1)
LOCAL_SHARED_LIBRARIES += libsrtp
endif
else
LOCAL_LDLIBS += -lz
#LOCAL_STATIC_LIBRARIES += libz libdl
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_STATIC_LIBRARIES += libzrtpcpp-static
LOCAL_STATIC_LIBRARIES += \
libssl-static libcrypto-static
endif
ifeq ($(BUILD_SRTP),1)
LOCAL_STATIC_LIBRARIES += libsrtp-static
endif
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += libssl-linphone libcrypto-linphone
LOCAL_SHARED_LIBRARIES += libzrtpcpp
endif
endif
ifeq ($(TARGET_ARCH), x86)
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
LOCAL_SHARED_LIBRARIES += libzrtpcpp
endif
ifeq ($(BUILD_SRTP),1)
ifeq ($(BUILD_SRTP),1)
LOCAL_SHARED_LIBRARIES += libsrtp
endif
endif
ifeq ($(BUILD_REMOTE_PROVISIONING),1)

10
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -57,13 +57,13 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
}
// OPENSSL (cryptography)
// lin prefix avoids collision with libs in /system/lib
loadOptionalLibrary("lincrypto");
loadOptionalLibrary("linssl");
// linphone suffix avoids collision with libs in /system/lib
loadOptionalLibrary("crypto-linphone-" + eabi);
loadOptionalLibrary("ssl-linphone-" + eabi);
// Secure RTP and key negotiation
loadOptionalLibrary("srtp");
loadOptionalLibrary("zrtpcpp"); // GPLv3+
loadOptionalLibrary("srtp-" + eabi);
loadOptionalLibrary("zrtpcpp" + eabi); // GPLv3+
// Tunnel
loadOptionalLibrary("tunnelclient");

2
oRTP

@ -1 +1 @@
Subproject commit 6b89540de309274bb7fdf10493879dd35c2792e1
Subproject commit 890e2306fca77146648f061ae754bec18304d4b7