From 9cf7c52213b3628cf659ad94269fcbdc5fb5a693 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 2 Apr 2013 09:18:25 +0200
Subject: [PATCH] add build option to disable polarssl

---
 Makefile             | 3 ++-
 jni/Application.mk   | 6 +++++-
 submodules/belle-sip | 2 +-
 submodules/linphone  | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3ebf9f4e9..5751ad57e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ BUILD_WEBRTC_AECM=1
 BUILD_FOR_X86=1
 USE_JAVAH=1
 LINPHONE_VIDEO=1
+BUILD_TLS=1
 
 # Checks
 CHECK_MSG=$(shell ./check_tools.sh)
@@ -119,7 +120,7 @@ prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/*_lrc $(TOPDIR)
 
 prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip
 
-LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) 
+LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) BUILD_TLS=$(BUILD_TLS)
 
 generate-libs: prepare-sources javah
 	$(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS)
diff --git a/jni/Application.mk b/jni/Application.mk
index 8c6ee8acc..9f424dcca 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,5 +1,5 @@
 APP_PROJECT_PATH := $(call my-dir)/../
-APP_MODULES      :=libspeex libgsm libortp polarssl antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon
+APP_MODULES      :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon
 APP_STL := stlport_static
 
 #uPnp
@@ -7,6 +7,10 @@ ifeq ($(BUILD_UPNP),1)
 APP_MODULES += libupnp
 endif
 
+ifeq ($(BUILD_TLS),1)
+APP_MODULES +=polarssl
+endif
+
 #remote provisioning
 ifeq ($(BUILD_REMOTE_PROVISIONING),1)
 APP_MODULES += libxml2 libxml2lpc liblpc2xml
diff --git a/submodules/belle-sip b/submodules/belle-sip
index e7852469a..f444e2f56 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit e7852469a6c204183f01639ab91e20fa8f50e773
+Subproject commit f444e2f56a78b0674ad237a1a5f7dfb7d020c1e4
diff --git a/submodules/linphone b/submodules/linphone
index 6ac44d662..cea2676af 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6ac44d6628bc258021c1526f39ee71f53061179e
+Subproject commit cea2676afe046ed9017675222b0273124f1d648f