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

[linphone] / build / android / common.mk

diff --git a/build/android/common.mk b/build/android/common.mk
index 9fd68d779405fae709402a255e9dac5a120db715..d0bf70cad875cea0cdfcdaec7a38ea070f327003 100644 (file)
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -44,7 +44,8 @@ LOCAL_SRC_FILES := \
        linphonecall.c \
        conference.c \
        ec-calibrator.c \
-       linphone_tunnel_config.c
+       linphone_tunnel_config.c \
+       message_storage.c
 
 ifndef LINPHONE_VERSION
 LINPHONE_VERSION = "Devel"
@@ -95,6 +96,13 @@ LOCAL_STATIC_LIBRARIES := \
        libosip2 \
        libgsm 
 
+ifeq ($(BUILD_REMOTE_PROVISIONING),1)
+LOCAL_STATIC_LIBRARIES += \
+       libxml2lpc \
+       liblpc2xml \
+       liblpxml2
+endif
+
 ifeq ($(BUILD_TUNNEL),1)
 LOCAL_CFLAGS +=-DTUNNEL_ENABLED
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../tunnel/include $(LOCAL_PATH)/../../tunnel/src