From e963be6567a1ba7ff880a352a2dc30cc8348b2b9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Mon, 3 Feb 2014 17:00:13 +0100
Subject: [PATCH] Added option in Makefile to disable ms2 opensles soundcard
 compilation to produce Android 2.2 compliant library

---
 Makefile            | 4 +++-
 submodules/linphone | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6fc40e9ab..90082af37 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,7 @@ BUILD_SQLITE=1
 BUILD_CONTACT_HEADER=0
 BUILD_RTP_MAP=0
 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
+BUILD_OPENSLES_SOUNDCARD=1
 
 # Checks
 CHECK_MSG=$(shell ./check_tools.sh)
@@ -334,7 +335,8 @@ prepare-sources: build-ffmpeg build-x264 prepare-ilbc build-vpx prepare-silk pre
 GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
 	BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \
 	BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \
-	BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC)
+	BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) \
+	BUILD_OPENSLES_SOUNDCARD=$(BUILD_OPENSLES_SOUNDCARD)
 
 
 LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
diff --git a/submodules/linphone b/submodules/linphone
index 7240e93a3..941883df0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 7240e93a3c31d45ef376d887da3662d02b0c62bc
+Subproject commit 941883df0752dcec9ba8d5fdb5bc33027be58192