From 0e9b41562fe6c6f3629be3a3c61d12a2ab07e11e Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 28 Apr 2013 16:17:06 +0200 Subject: [PATCH] fix build. --- build/android/common.mk | 14 +++++------- build/android/lpc2xml.mk | 47 ---------------------------------------- build/android/xml2lpc.mk | 47 ---------------------------------------- 3 files changed, 6 insertions(+), 102 deletions(-) delete mode 100644 build/android/lpc2xml.mk delete mode 100644 build/android/xml2lpc.mk diff --git a/build/android/common.mk b/build/android/common.mk index 047d64b8c..06a773091 100644 --- a/build/android/common.mk +++ b/build/android/common.mk @@ -43,6 +43,7 @@ LOCAL_SRC_FILES := \ bellesip_sal/sal_op_message.c \ bellesip_sal/sal_op_presence.c \ bellesip_sal/sal_op_registration.c \ + bellesip_sal/sal_op_publish.c \ bellesip_sal/sal_sdp.c \ sal.c \ offeranswer.c \ @@ -98,12 +99,6 @@ LOCAL_STATIC_LIBRARIES := \ libbellesip \ libgsm -ifeq ($(BUILD_REMOTE_PROVISIONING),1) -LOCAL_STATIC_LIBRARIES += \ - libxml2lpc \ - liblpc2xml \ - liblpxml2 -endif ifeq ($(BUILD_TUNNEL),1) LOCAL_CFLAGS +=-DTUNNEL_ENABLED @@ -204,6 +199,7 @@ else LOCAL_STATIC_LIBRARIES += libsrtp-static endif endif + ifeq ($(BUILD_REMOTE_PROVISIONING),1) LOCAL_SRC_FILES += ../tools/xml2lpc.c \ ../tools/xml2lpc_jni.cc \ @@ -211,8 +207,10 @@ LOCAL_SRC_FILES += ../tools/xml2lpc.c \ ../tools/lpc2xml_jni.cc LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/../../externals/libxml2/include \ - $(LOCAL_PATH)/../../externals/build/libxml2 -LOCAL_STATIC_LIBRARIES += libxml2 + $(LOCAL_PATH)/../../externals/build/libxml2 + +LOCAL_STATIC_LIBRARIES += liblpxml2 + endif LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) diff --git a/build/android/lpc2xml.mk b/build/android/lpc2xml.mk deleted file mode 100644 index d93be9b79..000000000 --- a/build/android/lpc2xml.mk +++ /dev/null @@ -1,47 +0,0 @@ -## -## Android.mk -Android build script- -## -## -## Copyright (C) 2013 Belledonne Communications, Grenoble, France -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## - -LOCAL_PATH:= $(call my-dir)/../../tools - -include $(CLEAR_VARS) - -LOCAL_CPP_EXTENSION := .cc - -LOCAL_SRC_FILES := \ - lpc2xml.c \ - lpc2xml_jni.cc \ - -LOCAL_CFLAGS += -DIN_LINPHONE - -LOCAL_C_INCLUDES = \ - $(LOCAL_PATH)/../coreapi \ - $(LOCAL_PATH)/../oRTP/include \ - $(LOCAL_PATH)/../mediastreamer2/include \ - $(LOCAL_PATH)/../../externals/libxml2/include \ - $(LOCAL_PATH)/../../externals/build/libxml2 \ - -LOCAL_SHARED_LIBRARIES = \ -# liblinphonenoneon \ -# liblinphone \ - -LOCAL_MODULE := liblpc2xml - -include $(BUILD_STATIC_LIBRARY) diff --git a/build/android/xml2lpc.mk b/build/android/xml2lpc.mk deleted file mode 100644 index 55e4a03a0..000000000 --- a/build/android/xml2lpc.mk +++ /dev/null @@ -1,47 +0,0 @@ -## -## Android.mk -Android build script- -## -## -## Copyright (C) 2013 Belledonne Communications, Grenoble, France -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## - -LOCAL_PATH:= $(call my-dir)/../../tools - -include $(CLEAR_VARS) - -LOCAL_CPP_EXTENSION := .cc - -LOCAL_SRC_FILES := \ - xml2lpc.c \ - xml2lpc_jni.cc \ - -LOCAL_CFLAGS += -DIN_LINPHONE - -LOCAL_C_INCLUDES = \ - $(LOCAL_PATH)/../coreapi \ - $(LOCAL_PATH)/../oRTP/include \ - $(LOCAL_PATH)/../mediastreamer2/include \ - $(LOCAL_PATH)/../../externals/libxml2/include \ - $(LOCAL_PATH)/../../externals/build/libxml2 \ - -LOCAL_SHARED_LIBRARIES = \ -# liblinphonenoneon \ -# liblinphone \ - -LOCAL_MODULE := libxml2lpc - -include $(BUILD_STATIC_LIBRARY)