fix build.

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) 

build/android/lpc2xml.mk

-##
-## 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)

build/android/xml2lpc.mk

-##
-## 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)