mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 05:38:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bzrtp integration for android

Browse source
This commit is contained in:
Jehan Monnier 2014-04-02 17:24:49 +02:00
parent 0aaac5f605
commit 75529783cf
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/android/Android.mk
View file

@ -199,13 +199,12 @@ LOCAL_SRC_FILES += $(LIBLINPHONE_EXTENDED_SRC_FILES)
LOCAL_CFLAGS += $(LIBLINPHONE_EXTENDED_CFLAGS)
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += libssl-linphone libcrypto-linphone
LOCAL_SHARED_LIBRARIES += libbzrtp
ifeq ($(BUILD_ZRTP),1)
LOCAL_STATIC_LIBRARIES += libbzrtp
endif
ifeq ($(BUILD_SRTP),1)
LOCAL_SHARED_LIBRARIES += libsrtp
LOCAL_STATIC_LIBRARIES += libsrtp
endif
ifeq ($(BUILD_SQLITE),1)

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

@ -57,10 +57,6 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
loadOptionalLibrary("avcodec-linphone-arm");
}
// Secure RTP and key negotiation
loadOptionalLibrary("srtp-" + eabi);
loadOptionalLibrary("zrtpcpp-" + eabi); // GPLv3+
//Main library
System.loadLibrary("linphone-" + eabi);

2
oRTP

@ -1 +1 @@
Subproject commit 5008a70e077b3706de4a48374f162f93071b4d08
Subproject commit 393857c0e8e5cab10a8d647cc89c8390355745a7