From 2ffe75737083f1a813a54d783ab5a8ccc8f606a7 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 28 Jan 2013 14:13:14 +0100
Subject: [PATCH] Fix android build.

---
 build/android/common.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/android/common.mk b/build/android/common.mk
index d629b54af..86475081e 100644
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -44,7 +44,7 @@ LOCAL_SRC_FILES := \
 	linphonecall.c \
 	conference.c \
 	ec-calibrator.c \
-	linphone_tunnel.cc
+	linphone_tunnel_config.c
 
 ifndef LINPHONE_VERSION
 LINPHONE_VERSION = "Devel"
@@ -100,12 +100,14 @@ LOCAL_STATIC_LIBRARIES := \
 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