From 392b36c2429e268f291d22882ab195d46c70d5d5 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 21 Jun 2013 11:28:43 +0200 Subject: [PATCH] libxml2 is now mandatory. --- build/android/common.mk | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build/android/common.mk b/build/android/common.mk index 67bcd336c..cffaa1e0c 100644 --- a/build/android/common.mk +++ b/build/android/common.mk @@ -92,7 +92,9 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/../oRTP/include \ $(LOCAL_PATH)/../mediastreamer2/include \ $(LOCAL_PATH)/../../belle-sip/include \ - $(LOCAL_PATH)/../../../gen + $(LOCAL_PATH)/../../../gen \ + $(LOCAL_PATH)/../../externals/libxml2/include \ + $(LOCAL_PATH)/../../externals/build/libxml2 LOCAL_LDLIBS += -llog -ldl @@ -101,7 +103,8 @@ LOCAL_STATIC_LIBRARIES := \ libmediastreamer2 \ libortp \ libbellesip \ - libgsm + libgsm \ + liblpxml2 ifeq ($(BUILD_TUNNEL),1) @@ -209,12 +212,7 @@ LOCAL_SRC_FILES += ../tools/xml2lpc.c \ ../tools/xml2lpc_jni.cc \ ../tools/lpc2xml.c \ ../tools/lpc2xml_jni.cc -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/../../externals/libxml2/include \ - $(LOCAL_PATH)/../../externals/build/libxml2 -LOCAL_STATIC_LIBRARIES += liblpxml2 - endif LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)