From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Wed, 10 Apr 2013 12:05:20 +0000 (+0200)
Subject: Use static lib for xml2lpc and lpc2xml
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=043f9122fdc37c0c544357735429f4c114241dec

Use static lib for xml2lpc and lpc2xml
---

diff --git a/build/android/common.mk b/build/android/common.mk
index 543a9dc1..58464973 100644
--- 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 b5757ad9..91038adc 100644
--- 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 449251cc..e89ab383 100644
--- 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 97ef9963..2f3d9075 100644
--- 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 9f6cb0f2..5e0a8188 100644
--- 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;