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

Merge remote-tracking branch 'public/master' into belle-sip

Browse source
This commit is contained in:
Jehan Monnier 2013-04-10 14:29:01 +02:00
commit a50f1cee88
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/android/common.mk
View file

@ -97,6 +97,11 @@ LOCAL_STATIC_LIBRARIES := \
libortp \
libbellesip \
libgsm
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
LOCAL_STATIC_LIBRARIES += \
libxml2lpc \
liblpc2xml
endif
ifeq ($(BUILD_TUNNEL),1)
LOCAL_CFLAGS +=-DTUNNEL_ENABLED

8
build/android/lpc2xml.mk
View file

@ -39,10 +39,10 @@ LOCAL_C_INCLUDES = \
$(LOCAL_PATH)/../../externals/build/libxml2 \
LOCAL_SHARED_LIBRARIES = \
libxml2 \
liblinphonenoneon \
liblinphone \
libxml2
# liblinphonenoneon \
# liblinphone \
LOCAL_MODULE := liblpc2xml
include $(BUILD_SHARED_LIBRARY)
include $(BUILD_STATIC_LIBRARY)

8
build/android/xml2lpc.mk
View file

@ -39,10 +39,10 @@ LOCAL_C_INCLUDES = \
$(LOCAL_PATH)/../../externals/build/libxml2 \
LOCAL_SHARED_LIBRARIES = \
libxml2 \
liblinphonenoneon \
liblinphone \
libxml2
# liblinphonenoneon \
# liblinphone \
LOCAL_MODULE := libxml2lpc
include $(BUILD_SHARED_LIBRARY)
include $(BUILD_STATIC_LIBRARY)

5
coreapi/linphonecore.c
View file

@ -424,11 +424,6 @@ void linphone_core_set_log_file(FILE *file) {
void linphone_core_set_log_level(OrtpLogLevel loglevel) {
ortp_set_log_level_mask(loglevel);
if (loglevel == 0) {
sal_disable_logs();
} else {
sal_enable_logs();
}
}
/**

2
java/impl/org/linphone/tools/Lpc2Xml.java
View file

@ -59,7 +59,7 @@ public class Lpc2Xml {
static {
try {
System.loadLibrary("xml2");
System.loadLibrary("lpc2xml");
//System.loadLibrary("lpc2xml");
mAvailable = true;
} catch (Throwable e) {
mAvailable = false;

2
java/impl/org/linphone/tools/Xml2Lpc.java
View file

@ -63,7 +63,7 @@ public class Xml2Lpc {
static {
try {
System.loadLibrary("xml2");
System.loadLibrary("xml2lpc");
//System.loadLibrary("xml2lpc");
mAvailable = true;
} catch (Throwable e) {
mAvailable = false;