From ea9eb6b58b2a3897138f15a130f84bb908fe3df7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 23 Jan 2014 12:27:52 +0100
Subject: [PATCH] updated liblinphone/ms2 with opensles sound module

---
 Makefile                              | 6 +++---
 src/org/linphone/LinphoneManager.java | 2 +-
 submodules/linphone                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8d30e3821..eaeca4255 100644
--- a/Makefile
+++ b/Makefile
@@ -347,11 +347,11 @@ MEDIASTREAMER2_OPTIONS = $(GENERATE_OPTIONS) BUILD_MEDIASTREAMER2_SDK=1
 
 
 generate-libs: prepare-sources javah
-	$(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS)
+	$(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=android-14
 
 generate-mediastreamer2-libs: prepare-sources
 	@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
-	$(NDK_PATH)/ndk-build $(MEDIASTREAMER2_OPTIONS) -j$(NUMCPUS)
+	$(NDK_PATH)/ndk-build $(MEDIASTREAMER2_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=android-14
 
 update-project:
 	$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
@@ -362,7 +362,7 @@ update-mediastreamer2-project:
 	$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
 
 liblinphone_tester: prepare-sources prepare-cunit prepare-liblinphone_tester javah
-	$(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS)
+	$(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=android-14
 
 javah: 
 	ant javah
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 1cd92ce93..f3c9d98cf 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -586,7 +586,7 @@ public class LinphoneManager implements LinphoneCoreListener {
 		boolean isDebugLogEnabled = !(mR.getBoolean(R.bool.disable_every_log)) && mPrefs.isDebugEnabled();
 		LinphoneCoreFactory.instance().setDebugMode(isDebugLogEnabled, getString(R.string.app_name));
 		
-		mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, mLinphoneConfigFile, mLinphoneFactoryConfigFile, null);
+		mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, mLinphoneConfigFile, mLinphoneFactoryConfigFile, null, c);
 		mLc.setContext(c);
 		try {
 			String versionName = c.getPackageManager().getPackageInfo(c.getPackageName(), 0).versionName;
diff --git a/submodules/linphone b/submodules/linphone
index 87d4f5f89..8bf0387c3 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 87d4f5f895c3f989d250614f0ced324502c900ea
+Subproject commit 8bf0387c35528ead879d1610e13e3a86fabc3669