Commit 043f9122 authored by Yann Diorcet's avatar Yann Diorcet
Browse files

Use static lib for xml2lpc and lpc2xml

parent f4971473
...@@ -95,6 +95,11 @@ LOCAL_STATIC_LIBRARIES := \ ...@@ -95,6 +95,11 @@ LOCAL_STATIC_LIBRARIES := \
libeXosip2 \ libeXosip2 \
libosip2 \ libosip2 \
libgsm libgsm
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
LOCAL_STATIC_LIBRARIES += \
libxml2lpc \
liblpc2xml
endif
ifeq ($(BUILD_TUNNEL),1) ifeq ($(BUILD_TUNNEL),1)
LOCAL_CFLAGS +=-DTUNNEL_ENABLED LOCAL_CFLAGS +=-DTUNNEL_ENABLED
......
...@@ -39,10 +39,10 @@ LOCAL_C_INCLUDES = \ ...@@ -39,10 +39,10 @@ LOCAL_C_INCLUDES = \
$(LOCAL_PATH)/../../externals/build/libxml2 \ $(LOCAL_PATH)/../../externals/build/libxml2 \
LOCAL_SHARED_LIBRARIES = \ LOCAL_SHARED_LIBRARIES = \
libxml2 \ libxml2
liblinphonenoneon \ # liblinphonenoneon \
liblinphone \ # liblinphone \
LOCAL_MODULE := liblpc2xml LOCAL_MODULE := liblpc2xml
include $(BUILD_SHARED_LIBRARY) include $(BUILD_STATIC_LIBRARY)
...@@ -39,10 +39,10 @@ LOCAL_C_INCLUDES = \ ...@@ -39,10 +39,10 @@ LOCAL_C_INCLUDES = \
$(LOCAL_PATH)/../../externals/build/libxml2 \ $(LOCAL_PATH)/../../externals/build/libxml2 \
LOCAL_SHARED_LIBRARIES = \ LOCAL_SHARED_LIBRARIES = \
libxml2 \ libxml2
liblinphonenoneon \ # liblinphonenoneon \
liblinphone \ # liblinphone \
LOCAL_MODULE := libxml2lpc LOCAL_MODULE := libxml2lpc
include $(BUILD_SHARED_LIBRARY) include $(BUILD_STATIC_LIBRARY)
...@@ -59,7 +59,7 @@ public class Lpc2Xml { ...@@ -59,7 +59,7 @@ public class Lpc2Xml {
static { static {
try { try {
System.loadLibrary("xml2"); System.loadLibrary("xml2");
System.loadLibrary("lpc2xml"); //System.loadLibrary("lpc2xml");
mAvailable = true; mAvailable = true;
} catch (Throwable e) { } catch (Throwable e) {
mAvailable = false; mAvailable = false;
......
...@@ -63,7 +63,7 @@ public class Xml2Lpc { ...@@ -63,7 +63,7 @@ public class Xml2Lpc {
static { static {
try { try {
System.loadLibrary("xml2"); System.loadLibrary("xml2");
System.loadLibrary("xml2lpc"); //System.loadLibrary("xml2lpc");
mAvailable = true; mAvailable = true;
} catch (Throwable e) { } catch (Throwable e) {
mAvailable = false; mAvailable = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment