Use static lib for xml2lpc and lpc2xml

diff --git a/build/android/common.mk b/build/android/common.mk
index 543a9dc19492307cfd0bf208a17b7fce44bbf853..5846497355d9ffa3d5e5aa9d322588f10643f21c 100644 (file)
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -95,6 +95,11 @@ LOCAL_STATIC_LIBRARIES := \
        libeXosip2 \
        libosip2 \
        libgsm 
+ifeq ($(BUILD_REMOTE_PROVISIONING),1)
+LOCAL_STATIC_LIBRARIES += \
+       libxml2lpc \
+       liblpc2xml
+endif
 
 ifeq ($(BUILD_TUNNEL),1)
 LOCAL_CFLAGS +=-DTUNNEL_ENABLED

diff --git a/build/android/lpc2xml.mk b/build/android/lpc2xml.mk
index b5757ad99ed45bb1a5997f0ce710561a5594911c..91038adce91de71e52669c29d7b1ea36c695c45b 100644 (file)
--- a/build/android/lpc2xml.mk
+++ b/build/android/lpc2xml.mk
@@ -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)

diff --git a/build/android/xml2lpc.mk b/build/android/xml2lpc.mk
index 449251cc827d76096f0896692e7b402e16033c6c..e89ab383bd9c1722c3908921e27aa0715a42103e 100644 (file)
--- a/build/android/xml2lpc.mk
+++ b/build/android/xml2lpc.mk
@@ -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)

diff --git a/java/impl/org/linphone/tools/Lpc2Xml.java b/java/impl/org/linphone/tools/Lpc2Xml.java
index 97ef99637bb2f82a3224ec3ab4b5ee8e677edb17..2f3d907516a0e8367b61106671ff28e151c4829b 100644 (file)
--- a/java/impl/org/linphone/tools/Lpc2Xml.java
+++ b/java/impl/org/linphone/tools/Lpc2Xml.java
@@ -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;

diff --git a/java/impl/org/linphone/tools/Xml2Lpc.java b/java/impl/org/linphone/tools/Xml2Lpc.java
index 9f6cb0f27b925e3544dd857a76b32ce8a27b856a..5e0a818809be3ef48f100dada5d389cb8bb16916 100644 (file)
--- a/java/impl/org/linphone/tools/Xml2Lpc.java
+++ b/java/impl/org/linphone/tools/Xml2Lpc.java
@@ -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;