From 737ce2f4fe800641b51d0b51144ffdc29d9c3810 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 21 Jun 2013 11:30:07 +0200 Subject: [PATCH] libxml2 is now mandatory. --- jni/Android.mk | 2 -- jni/Application.mk | 7 +------ submodules/belle-sip | 2 +- submodules/linphone | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 48395a229..43d1185d3 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -42,9 +42,7 @@ include $(linphone-root-dir)/submodules/externals/build/libupnp/Android.mk endif #libxml2 -ifeq ($(BUILD_REMOTE_PROVISIONING),1) include $(linphone-root-dir)/submodules/externals/build/libxml2/Android.mk -endif # Speex ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk),) diff --git a/jni/Application.mk b/jni/Application.mk index 257dc0872..1e9a88723 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,5 +1,5 @@ APP_PROJECT_PATH := $(call my-dir)/../ -APP_MODULES :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon +APP_MODULES :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon liblpxml2 APP_STL := stlport_static #uPnp @@ -11,11 +11,6 @@ ifeq ($(BUILD_TLS),1) APP_MODULES +=polarssl endif -#remote provisioning -ifeq ($(BUILD_REMOTE_PROVISIONING),1) -APP_MODULES += liblpxml2 -endif - #default values ifeq ($(BUILD_AMRNB),) BUILD_AMRNB=light diff --git a/submodules/belle-sip b/submodules/belle-sip index 1341e9034..3d18c79dd 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 1341e9034174f390cb1eca76ceda09a86ecbea71 +Subproject commit 3d18c79dd5c33b748b1952d3743615450e82ae6b diff --git a/submodules/linphone b/submodules/linphone index 0c4216948..392b36c24 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0c4216948db781fb1cdc7cb9729997e347cd080a +Subproject commit 392b36c2429e268f291d22882ab195d46c70d5d5