From 82baf820c64df653711a40dd87f8c4394fe71155 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 7 Jan 2015 10:30:50 +0100
Subject: [PATCH] ILBC build is now optionnal

---
 Makefile            | 14 ++++++++++----
 jni/Android.mk      |  4 +++-
 jni/Application.mk  |  2 ++
 submodules/linphone |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index a8932eff8..86628a22e 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,7 @@ BUILD_SQLITE=1
 BUILD_CONTACT_HEADER=0
 BUILD_RTP_MAP=0
 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
+BUILD_LIBILBC=1
 LIBLINPHONE_EXTENDED_SRC_FILES=
 LIBLINPHONE_EXTENDED_C_INCLUDES=
 LIBLINPHONE_EXTENDED_CFLAGS=
@@ -110,7 +111,11 @@ $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
 	cd $(LIBILBC_BUILD_DIR)/downloads && make \
 	|| ( echo "iLBC prepare stage failed" ; exit 1 )
 
+ifeq ($(BUILD_LIBILBC),1)
 prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
+else
+prepare-ilbc:
+endif
 
 #ffmpeg
 ifeq ($(BUILD_VIDEO),1)
@@ -390,12 +395,13 @@ prepare-sqlite3:
 endif
 
 $(SQLITE_BUILD_DIR)/sqlite3.c: $(SQLITE_BASENAME).zip
-	unzip -oq "$<" "*/sqlite3.?" -d  $(SQLITE_BUILD_DIR)/
-	mv "$(SQLITE_BUILD_DIR)/$(SQLITE_BASENAME)/sqlite3".? $(SQLITE_BUILD_DIR)/
-	rmdir "$(SQLITE_BUILD_DIR)/$(SQLITE_BASENAME)/"
+       unzip -oq "$<" "*/sqlite3.?" -d  $(SQLITE_BUILD_DIR)/
+       mv "$(SQLITE_BUILD_DIR)/$(SQLITE_BASENAME)/sqlite3".? $(SQLITE_BUILD_DIR)/
+       rmdir "$(SQLITE_BUILD_DIR)/$(SQLITE_BASENAME)/"
 
 $(SQLITE_BASENAME).zip:
-	curl -sO $(SQLITE_URL)
+       curl -sO $(SQLITE_URL)
+
 
 #Matroska2
 MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska
diff --git a/jni/Android.mk b/jni/Android.mk
index aa5b33e45..c1951fdde 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -19,7 +19,7 @@ $(info $(TARGET_ARCH_ABI): Video is disabled for targets other than armeabi-v7a
 endif
 endif
 
-#libxml2 
+#libxml2
 include $(linphone-root-dir)/submodules/externals/build/libxml2/Android.mk
 
 ifeq ($(BUILD_ZRTP), 1)
@@ -82,7 +82,9 @@ endif
 include $(linphone-root-dir)/submodules/mssilk/Android.mk
 endif
 
+ifeq ($(BUILD_ILBC), 1)
 include $(linphone-root-dir)/submodules/msilbc/Android.mk
+endif
 
 ifeq ($(_BUILD_VIDEO),1)
 
diff --git a/jni/Application.mk b/jni/Application.mk
index d4a0793cb..dbecac68a 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -127,7 +127,9 @@ ifeq ($(BUILD_ZRTP), 1)
 APP_MODULES      += libbzrtp
 endif
 
+ifeq ($(BUILD_ILBC), 1)
 APP_MODULES      +=libmsilbc
+endif
 
 ifeq ($(BUILD_SRTP), 1)
 APP_MODULES      += libsrtp
diff --git a/submodules/linphone b/submodules/linphone
index ce396cc98..ff330203a 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ce396cc98279b99ac6b67f8e15c09ae059241843
+Subproject commit ff330203afef25cb00b50210f4111af883e6b0f1