Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libxml2 is now mandatory.

Browse source
This commit is contained in:
Ghislain MARY 2013-06-21 11:30:07 +02:00
parent 997807fd3e
commit 737ce2f4fe
4 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/Android.mk
View file

@ -42,9 +42,7 @@ include $(linphone-root-dir)/submodules/externals/build/libupnp/Android.mk
endif endif
#libxml2 #libxml2
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
include $(linphone-root-dir)/submodules/externals/build/libxml2/Android.mk include $(linphone-root-dir)/submodules/externals/build/libxml2/Android.mk
endif
# Speex # Speex
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk),)

7
jni/Application.mk
View file

@ -1,5 +1,5 @@
APP_PROJECT_PATH := $(call my-dir)/../ 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 APP_STL := stlport_static
#uPnp #uPnp
@ -11,11 +11,6 @@ ifeq ($(BUILD_TLS),1)
APP_MODULES +=polarssl APP_MODULES +=polarssl
endif endif
#remote provisioning
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
APP_MODULES += liblpxml2
endif
#default values #default values
ifeq ($(BUILD_AMRNB),) ifeq ($(BUILD_AMRNB),)
BUILD_AMRNB=light BUILD_AMRNB=light

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 1341e9034174f390cb1eca76ceda09a86ecbea71 Subproject commit 3d18c79dd5c33b748b1952d3743615450e82ae6b

2
submodules/linphone

@ -1 +1 @@
Subproject commit 0c4216948db781fb1cdc7cb9729997e347cd080a Subproject commit 392b36c2429e268f291d22882ab195d46c70d5d5