From e5c5c45147098164183cf4f11e55730688682a2c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 22 Sep 2016 10:41:14 +0200
Subject: [PATCH] Keep track of used ABI when loading Android libraries

---
 .../core/LinphoneCoreFactoryImpl.java         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 76f921fb3..11cb0d87e 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -30,25 +30,25 @@ import org.linphone.mediastream.Version;
 import org.linphone.tools.OpenH264DownloadHelper;
 
 public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
-
+	public static String ABI;
+	
 	private static boolean loadOptionalLibrary(String s) {
 		try {
 			System.loadLibrary(s);
 			return true;
 		} catch (Throwable e) {
-			android.util.Log.w("LinphoneCoreFactoryImpl", "Unable to load optional library " + s
-					+ ": " +e.getMessage());
+			android.util.Log.w("LinphoneCoreFactoryImpl", "Unable to load optional library " + s + ": " +e.getMessage());
 		}
 		return false;
 	}
 
 	static {
-		List<String> cpuabis=Version.getCpuAbis();
-		boolean libLoaded=false;
-		Throwable firstException=null;
+		List<String> cpuabis = Version.getCpuAbis();
+		boolean libLoaded = false;
+		Throwable firstException = null;
 		System.loadLibrary("gnustl_shared");
-		for (String abi : cpuabis){
-			//android.util.Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi);
+		for (String abi : cpuabis) {
+			android.util.Log.i("LinphoneCoreFactoryImpl", "Trying to load liblinphone for " + abi);
 			loadOptionalLibrary("ffmpeg-linphone-" + abi);
 			//Main library
 			try {
@@ -57,11 +57,11 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 				System.loadLibrary("mediastreamer_base-" + abi);
 				System.loadLibrary("mediastreamer_voip-" + abi);
 				System.loadLibrary("linphone-" + abi);
-				org.linphone.mediastream.Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
-				libLoaded=true;
+				ABI = abi;
+				libLoaded = true;
 				break;
-			}catch(Throwable e) {
-				if (firstException == null) firstException=e;
+			} catch(Throwable e) {
+				if (firstException == null) firstException = e;
 			}
 		}