From 1e3f22f47afc7a6c2758f6063902292cea87580e Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 24 Apr 2013 11:59:32 +0200
Subject: [PATCH] build libxml2 statically rename it to liblpxml2 (libxml2 is
 part of android system already).

---
 jni/Application.mk                            |  2 +-
 submodules/externals/build/libxml2/Android.mk | 11 ++---------
 submodules/linphone                           |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index 94a2b0c13..7dfa25a22 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -9,7 +9,7 @@ endif
 
 #remote provisioning
 ifeq ($(BUILD_REMOTE_PROVISIONING),1)
-APP_MODULES += libxml2 libxml2lpc liblpc2xml
+APP_MODULES += liblpxml2 libxml2lpc liblpc2xml
 endif
 
 #default values
diff --git a/submodules/externals/build/libxml2/Android.mk b/submodules/externals/build/libxml2/Android.mk
index cb8329c97..f378940cb 100644
--- a/submodules/externals/build/libxml2/Android.mk
+++ b/submodules/externals/build/libxml2/Android.mk
@@ -53,17 +53,10 @@ common_C_INCLUDES += \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/../build/libxml2  \
 
-# For the device
-# =====================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(common_SRC_FILES)
 LOCAL_C_INCLUDES += $(common_C_INCLUDES)
-LOCAL_SHARED_LIBRARIES += $(common_SHARED_LIBRARIES)
 #LOCAL_CFLAGS += -fvisibility=hidden
 
-LOCAL_MODULE:= libxml2
+LOCAL_MODULE:= liblpxml2
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
diff --git a/submodules/linphone b/submodules/linphone
index 846d2c57a..cf2c2337e 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 846d2c57afa43494aa7e533ca8816d40edeff126
+Subproject commit cf2c2337e334c4de95d3fca4732e996c9e2d0e3a