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

Use tunnelclient and bcg729 static libraries on Android.

Browse source
This commit is contained in:
Ghislain MARY 2013-10-03 17:52:27 +02:00
parent 9680b2915a
commit 3c772ea1fe
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/android/common.mk
View file

@ -111,11 +111,7 @@ ifeq ($(BUILD_TUNNEL),1)
LOCAL_CFLAGS +=-DTUNNEL_ENABLED
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../tunnel/include $(LOCAL_PATH)/../../tunnel/src
LOCAL_SRC_FILES += linphone_tunnel.cc TunnelManager.cc
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_SHARED_LIBRARIES += libtunnelclient
else
LOCAL_STATIC_LIBRARIES += libtunnelclient
endif
else
LOCAL_SRC_FILES += linphone_tunnel_stubs.c
endif
@ -150,8 +146,7 @@ endif
ifeq ($(BUILD_G729),1)
LOCAL_CFLAGS += -DHAVE_G729
LOCAL_SHARED_LIBRARIES += libbcg729
LOCAL_STATIC_LIBRARIES += libmsbcg729
LOCAL_STATIC_LIBRARIES += libbcg729 libmsbcg729
endif
ifeq ($(_BUILD_VIDEO),1)

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

@ -65,12 +65,6 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
loadOptionalLibrary("srtp-" + eabi);
loadOptionalLibrary("zrtpcpp" + eabi); // GPLv3+
// Tunnel
loadOptionalLibrary("tunnelclient");
// g729 A implementation
loadOptionalLibrary("bcg729");
//Main library
System.loadLibrary("linphone-" + eabi);