From 35c57ff01bc2505375b0c5ff2bcd61d666ed093a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Wed, 5 Feb 2014 15:53:24 +0100
Subject: [PATCH] Improved opensles soundcard to keep Android 2.2 compatibility

---
 Makefile            |  5 +----
 README              | 10 ++++++----
 submodules/linphone |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index a1d465268..277b47e36 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,6 @@ 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)
@@ -335,9 +334,7 @@ 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_OPENSLES_SOUNDCARD=$(BUILD_OPENSLES_SOUNDCARD)
-
+	BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC)
 
 LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
 	LINPHONE_VERSION=$(LINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \
diff --git a/README b/README
index a14f963e2..6ebceefc3 100644
--- a/README
+++ b/README
@@ -35,6 +35,12 @@ To create an apk with a different package name, you need to edit the custom_rule
 If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU
 When using the ndk-r9b or ndk-r9c you may have an issue when compiling with x264. If so, use ndk-r9 instead.
 
+If you built the app using eclipse, ensure you ran at least once the make command (see above steps 0 to 3) ! Else you'll have this exceptions:
+FATAL EXCEPTION: main
+java.lang.ExceptionInInitializerError
+...
+Caused by: java.lang.UnsatisfiedLinkError: Couldn't load linphone-armeabi-v7a: findLibrary returned null
+...
 
 			   CUSTOMIZATION
 			*****************************
@@ -98,7 +104,3 @@ BUILD_OPUS
 
 BUILD_UPNP
 	values: 0 (don't build upnp), 1 (do build upnp), default value: 1
-
-BUILD_OPENSLES_SOUNDCARD
-	values: 0 (don't build ms2 opensles soundcard, requiered to be able to run the app on Android 2.2), 1 (do build ms2 opensles soundcard, used on Android >= 4.4 devices)
-	default value: 1
diff --git a/submodules/linphone b/submodules/linphone
index 10b8224e3..1817c82f7 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 10b8224e38fec5895aec47b888f11c6a5f19f2b1
+Subproject commit 1817c82f7cd91b090f915e775e2a6ff83dd514e1