From 777fd05999e7910372d359372808cba75d1fd65c Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 19 May 2017 10:31:04 +0200
Subject: [PATCH] Fix liblinphone_tester makefile and manifest

---
 liblinphone_tester/AndroidManifest.xml | 2 +-
 liblinphone_tester/Makefile            | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/liblinphone_tester/AndroidManifest.xml b/liblinphone_tester/AndroidManifest.xml
index df3a24e3e..dd1217b66 100644
--- a/liblinphone_tester/AndroidManifest.xml
+++ b/liblinphone_tester/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="16"
         android:targetSdkVersion="23" />
 
     <instrumentation
diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile
index e020bbc18..c904604a5 100644
--- a/liblinphone_tester/Makefile
+++ b/liblinphone_tester/Makefile
@@ -14,8 +14,7 @@ copy-libs:
 	rm -rf libs/arm64-v8a
 	if test -d "../liblinphone-sdk/android-arm64"; then \
 		mkdir -p libs/arm64-v8a && \
-		cp -f ../liblinphone-sdk/android-arm64/lib/libgnustl_shared.so libs/arm64-v8a && \
-		cp -f ../liblinphone-sdk/android-arm64/lib/lib*-arm64-v8a.so libs/arm64-v8a && \
+		cp -f ../liblinphone-sdk/android-arm64/lib/*.so libs/arm64-v8a && \
 		cp -f ../liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs/arm64-v8a && \
 		cp -f ../liblinphone-sdk/android-arm64/share/linphone/rootca.pem assets/config_files; \
 	fi
@@ -26,8 +25,7 @@ copy-libs:
 	rm -rf libs/armeabi-v7a
 	if test -d "../liblinphone-sdk/android-armv7"; then \
 		mkdir -p libs/armeabi-v7a && \
-		cp -f ../liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs/armeabi-v7a && \
-		cp -f ../liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \
+		cp -f ../liblinphone-sdk/android-armv7/lib/*.so libs/armeabi-v7a && \
 		cp -f ../liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \
 		cp -f ../liblinphone-sdk/android-armv7/share/linphone/rootca.pem assets/config_files; \
 	fi
@@ -38,8 +36,7 @@ copy-libs:
 	rm -rf libs/x86
 	if test -d "../liblinphone-sdk/android-x86"; then \
 		mkdir -p libs/x86 && \
-		cp -f ../liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs/x86 && \
-		cp -f ../liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \
+		cp -f ../liblinphone-sdk/android-x86/lib/*.so libs/x86 && \
 		cp -f ../liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \
 		cp -f ../liblinphone-sdk/android-x86/share/linphone/rootca.pem assets/config_files; \
 	fi