From 363d83d9a2ceda4eeef5cf0788ec10363315fbfb Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 5 Apr 2017 11:30:31 +0200
Subject: [PATCH] Fix mediastreamer2 java sdk

---
 prepare.py                | 28 +++++++++++++++++++++++++++-
 submodules/mediastreamer2 |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/prepare.py b/prepare.py
index 13ee6421a..8a97db5b1 100755
--- a/prepare.py
+++ b/prepare.py
@@ -300,6 +300,32 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
 \tfi
 
+copy-libs-mediastreamer:
+\trm -rf submodules/mediastreamer2/java/libs/armeabi
+\tif test -d "liblinphone-sdk/android-arm"; then \\
+\t\tmkdir -p submodules/mediastreamer2/java/libs/armeabi && \\
+\t\tcp -f liblinphone-sdk/android-arm/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/armeabi && \\
+\t\tsh WORK/android-arm/strip.sh submodules/mediastreamer2/java/libs/armeabi/*.so; \\
+\tfi
+\trm -rf submodules/mediastreamer2/java/libs/armeabi-v7a
+\tif test -d "liblinphone-sdk/android-armv7"; then \\
+\t\tmkdir -p submodules/mediastreamer2/java/libs/armeabi-v7a && \\
+\t\tcp -f liblinphone-sdk/android-armv7/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/armeabi-v7a && \\
+\t\tsh WORK/android-armv7/strip.sh submodules/mediastreamer2/java/libs/armeabi-v7a/*.so; \\
+\tfi
+\trm -rf submodules/mediastreamer2/java/libs/arm64-v8a
+\tif test -d "liblinphone-sdk/android-arm64"; then \\
+\t\tmkdir -p submodules/mediastreamer2/java/libs/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/arm64-v8a && \\
+\t\tsh WORK/android-arm64/strip.sh submodules/mediastreamer2/java/libs/arm64-v8a/*.so; \\
+\tfi
+\trm -rf submodules/mediastreamer2/java/libs/x86
+\tif test -d "liblinphone-sdk/android-x86"; then \\
+\t\tmkdir -p submodules/mediastreamer2/java/libs/x86 && \\
+\t\tcp -f liblinphone-sdk/android-x86/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/x86 && \\
+\t\tsh WORK/android-x86/strip.sh submodules/mediastreamer2/java/libs/x86/*.so; \\
+\tfi
+
 generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem
 \t./gradlew assembleDebug
 
@@ -328,7 +354,7 @@ linphone-android-sdk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem
 \t./gradlew -b linphoneAndroidSdk.gradle assembleRelease
 \t./gradlew -b linphoneAndroidSdk.gradle sdkZip
 
-mediastreamer2-sdk: build copy-libs
+mediastreamer2-sdk: build copy-libs-mediastreamer
 \t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\
 \t./gradlew -b mediastreamerSdk.gradle assembleRelease
 \t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index d18d48a12..bc087e2af 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit d18d48a12dbe4560dba5ffbdb58d71b4f149e5ca
+Subproject commit bc087e2afedb0a62e314c6455c3dd465fb79cd86