X-Git-Url: http://sjero.net/git/?p=linphone;a=blobdiff_plain;f=java%2Fimpl%2Forg%2Flinphone%2Fcore%2FLinphoneCoreFactoryImpl.java;h=1d14ceb1447eb742154ce4461b3250c81c6188c8;hp=0b799f33ee169bac41f0890068e96af85e64d1d2;hb=66dd5cec662d83030955966da96bb6addcde55f1;hpb=d42202ac67387f668e7201ab4b1e6b5d39b769ea

diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 0b799f33..1d14ceb1 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -71,20 +71,20 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 		loadOptionalLibrary("bcg729");
 
 		//Main library
-		if (!hasNeonInCpuFeatures()) {
-			try {
-				if (!isArmv7() && !Version.isX86()) {
-					System.loadLibrary("linphonearmv5"); 
-				} else {
-					System.loadLibrary("linphonenoneon"); 
-				}
-				Log.w("linphone", "No-neon liblinphone loaded");
-			} catch (UnsatisfiedLinkError ule) {
-				Log.w("linphone", "Failed to load no-neon liblinphone, loading neon liblinphone");
-				System.loadLibrary("linphone"); 
+		if (isArmv7()) {
+			if (hasNeonInCpuFeatures()) {
+				Log.d("linphone", "armv7 liblinphone loaded");
+				System.loadLibrary("linphonearmv7"); 
+			} else {
+				Log.w("linphone", "No-neon armv7 liblinphone loaded");
+				System.loadLibrary("linphonearmv7noneon"); 
 			}
+		} else if (Version.isX86()) {
+			Log.d("linphone", "No-neon x86 liblinphone loaded");
+			System.loadLibrary("linphonex86noneon"); 
 		} else {
-			System.loadLibrary("linphone"); 
+			Log.d("linphone", "No-neon armv5 liblinphone loaded");
+			System.loadLibrary("linphonearmv5noneon"); 
 		}
 
 		Version.dumpCapabilities();