link to libxml2 statically (shared version not working with android-ndk-r8e)

diff --git a/build/android/common.mk b/build/android/common.mk
index 5846497355d9ffa3d5e5aa9d322588f10643f21c..d0bf70cad875cea0cdfcdaec7a38ea070f327003 100644 (file)
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -95,10 +95,12 @@ LOCAL_STATIC_LIBRARIES := \
        libeXosip2 \
        libosip2 \
        libgsm 
+
 ifeq ($(BUILD_REMOTE_PROVISIONING),1)
 LOCAL_STATIC_LIBRARIES += \
        libxml2lpc \
-       liblpc2xml
+       liblpc2xml \
+       liblpxml2
 endif
 
 ifeq ($(BUILD_TUNNEL),1)

diff --git a/build/android/lpc2xml.mk b/build/android/lpc2xml.mk
index 91038adce91de71e52669c29d7b1ea36c695c45b..d93be9b790cdcce18ae11a02a1c83b8602baa4fe 100644 (file)
--- a/build/android/lpc2xml.mk
+++ b/build/android/lpc2xml.mk
@@ -39,7 +39,6 @@ LOCAL_C_INCLUDES = \
        $(LOCAL_PATH)/../../externals/build/libxml2 \
 
 LOCAL_SHARED_LIBRARIES = \
-       libxml2
 #      liblinphonenoneon \
 #      liblinphone \
 

diff --git a/build/android/xml2lpc.mk b/build/android/xml2lpc.mk
index e89ab383bd9c1722c3908921e27aa0715a42103e..55e4a03a0f5a49afe6b32d9243554e07085e35bb 100644 (file)
--- a/build/android/xml2lpc.mk
+++ b/build/android/xml2lpc.mk
@@ -39,7 +39,6 @@ LOCAL_C_INCLUDES = \
        $(LOCAL_PATH)/../../externals/build/libxml2 \
 
 LOCAL_SHARED_LIBRARIES = \
-       libxml2
 #      liblinphonenoneon \
 #      liblinphone \