From 941883df0752dcec9ba8d5fdb5bc33027be58192 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Mon, 3 Feb 2014 16:58:28 +0100
Subject: [PATCH] Added option to disable ms2 opensles soundcard compilation
 for Android

---
 build/android/Android.mk | 5 ++++-
 mediastreamer2           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 4f4e9954d..8dfe0cb84 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -105,7 +105,10 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../../externals/libxml2/include \
 	$(LOCAL_PATH)/../../externals/build/libxml2
 
-LOCAL_LDLIBS += -llog -lOpenSLES -ldl
+ifeq ($(BUILD_OPENSLES_SOUNDCARD),1)
+	LOCAL_LDLIBS += -lOpenSLES 
+endif
+LOCAL_LDLIBS += -llog -ldl
 
 LOCAL_STATIC_LIBRARIES := \
 	cpufeatures \
diff --git a/mediastreamer2 b/mediastreamer2
index 427dc4644..e2ea92a34 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 427dc46440d8f4121b7f50194ee61d9db25d2263
+Subproject commit e2ea92a34d2577910115e20574f3f1e6474850da