link to libxml2 statically (shared version not working with android-ndk-r8e)

[linphone] / build / android / common.mk

diff --git a/build/android/common.mk b/build/android/common.mk
index 4db1f68090a2452e0058c324429ef79ac2526ded..d0bf70cad875cea0cdfcdaec7a38ea070f327003 100644 (file)
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -44,11 +44,8 @@ LOCAL_SRC_FILES := \
        linphonecall.c \
        conference.c \
        ec-calibrator.c \
-       linphone_tunnel.cc
-
-ifndef MY_LOG_DOMAIN
-MY_LOG_DOMAIN = \"Linphone\"
-endif
+       linphone_tunnel_config.c \
+       message_storage.c
 
 ifndef LINPHONE_VERSION
 LINPHONE_VERSION = "Devel"
@@ -57,13 +54,12 @@ endif
 LOCAL_CFLAGS += \
        -D_BYTE_ORDER=_LITTLE_ENDIAN \
        -DORTP_INET6 \
-        -DINET6 \
-        -DOSIP_MT \
-       -DHAVE_EXOSIP_RESET_TRANSPORTS \
+       -DINET6 \
+       -DOSIP_MT \
        -DENABLE_TRACE \
+       -DHAVE_CONFIG_H \
        -DLINPHONE_VERSION=\"$(LINPHONE_VERSION)\" \
        -DLINPHONE_PLUGINS_DIR=\"\\tmp\" \
-       -DLOG_DOMAIN=$(MY_LOG_DOMAIN) 
 
 LOCAL_CFLAGS += -DIN_LINPHONE
 
@@ -74,13 +70,19 @@ LOCAL_CFLAGS += -DHAVE_X264
 endif
 endif
 
+ifeq ($(USE_JAVAH),1)
+LOCAL_CFLAGS += -DUSE_JAVAH
+endif
+
 LOCAL_C_INCLUDES += \
        $(LOCAL_PATH) \
        $(LOCAL_PATH)/include \
+       $(LOCAL_PATH)/../build/android \
        $(LOCAL_PATH)/../oRTP/include \
        $(LOCAL_PATH)/../mediastreamer2/include \
        $(LOCAL_PATH)/../../externals/exosip/include \
-       $(LOCAL_PATH)/../../externals/osip/include 
+       $(LOCAL_PATH)/../../externals/osip/include \
+       $(LOCAL_PATH)/../../../gen
 
 LOCAL_LDLIBS += -llog -ldl
 
@@ -94,15 +96,24 @@ LOCAL_STATIC_LIBRARIES := \
        libosip2 \
        libgsm 
 
+ifeq ($(BUILD_REMOTE_PROVISIONING),1)
+LOCAL_STATIC_LIBRARIES += \
+       libxml2lpc \
+       liblpc2xml \
+       liblpxml2
+endif
+
 ifeq ($(BUILD_TUNNEL),1)
 LOCAL_CFLAGS +=-DTUNNEL_ENABLED
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../tunnel/include $(LOCAL_PATH)/../../tunnel/src
-LOCAL_SRC_FILES +=  TunnelManager.cc
+LOCAL_SRC_FILES +=  linphone_tunnel.cc TunnelManager.cc
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_SHARED_LIBRARIES += libtunnelclient
 else
 LOCAL_STATIC_LIBRARIES += libtunnelclient
 endif
+else
+LOCAL_SRC_FILES += linphone_tunnel_stubs.c
 endif
 
 
@@ -149,6 +160,11 @@ LOCAL_STATIC_LIBRARIES += \
 endif
 endif
 
+ifeq ($(BUILD_UPNP),1)
+LOCAL_CFLAGS += -DBUILD_UPNP
+LOCAL_SRC_FILES += upnp.c
+endif
+
 LOCAL_STATIC_LIBRARIES += libspeex 
 
 ifeq ($(BUILD_SRTP), 1)