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

Removed useless code + updated ms2 with new opensles sound card

Browse source
This commit is contained in:
Sylvain Berfini 2014-02-05 15:51:30 +01:00
parent 77d09e7cff
commit 1817c82f7c
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/android/Android.mk
View file

@ -105,9 +105,6 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../externals/libxml2/include \
$(LOCAL_PATH)/../../externals/build/libxml2
ifeq ($(BUILD_OPENSLES_SOUNDCARD),1)
LOCAL_LDLIBS += -lOpenSLES
endif
LOCAL_LDLIBS += -llog -ldl
LOCAL_STATIC_LIBRARIES := \

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

@ -57,11 +57,6 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
loadOptionalLibrary("avcodec-linphone-arm");
}
// OPENSSL (cryptography)
// linphone suffix avoids collision with libs in /system/lib
loadOptionalLibrary("crypto-linphone-" + eabi);
loadOptionalLibrary("ssl-linphone-" + eabi);
// Secure RTP and key negotiation
loadOptionalLibrary("srtp-" + eabi);
loadOptionalLibrary("zrtpcpp-" + eabi); // GPLv3+

2
mediastreamer2

@ -1 +1 @@
Subproject commit bba5dff9ea4d4b6bc84d6b9b1e17469a3f8e6869
Subproject commit 509430ba06b18bbfb7d2d820ad86c7dcdb22af99