From ef0bb375a9151e9bf824c485c9b3a9b87f4e05ad Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 19 May 2017 10:45:43 +0200
Subject: [PATCH] Fix load of libraries in liblinphone_tester

---
 .../src/org/linphone/tester/Tester.java       | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java
index 8eb537496..753752a9c 100644
--- a/liblinphone_tester/src/org/linphone/tester/Tester.java
+++ b/liblinphone_tester/src/org/linphone/tester/Tester.java
@@ -29,26 +29,16 @@ public class Tester {
 		String ffmpegAbi;
 		boolean libLoaded=false;
 		Throwable firstException=null;
-		for (String abi : cpuabis){
-			Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi);
-			loadOptionalLibrary("ffmpeg-linphone-" + abi);
-			//Main library
-			try {
-				System.loadLibrary("bctoolbox-" + abi);
-				System.loadLibrary("bctoolbox-tester-" + abi);
-				System.loadLibrary("ortp-" + abi);
-				System.loadLibrary("mediastreamer_base-" + abi);
-				System.loadLibrary("mediastreamer_voip-" + abi);
-				System.loadLibrary("linphone-" + abi);
-				System.loadLibrary("linphonetester-" + abi);
 
-				Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
-				libLoaded=true;
-				break;
-			}catch(Throwable e) {
-				if (firstException == null) firstException=e;
-			}
-		}
+		loadOptionalLibrary("ffmpeg-linphone");
+		System.loadLibrary("bctoolbox");
+		System.loadLibrary("bctoolbox-tester");
+		System.loadLibrary("ortp");
+		System.loadLibrary("mediastreamer_base");
+		System.loadLibrary("mediastreamer_voip");
+		System.loadLibrary("linphone");
+		System.loadLibrary("linphonetester");
+		libLoaded=true;
 
 		if (!libLoaded){
 			throw new RuntimeException(firstException);