Renamed liblinphonex86noneon to liblinphonex86

[linphone] / java / impl / org / linphone / core / LinphoneCoreFactoryImpl.java

diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 04b6af1cf78471675e311fefb7c27c4471152487..8cedba44575e83bea58aa680078a9fbdb97d976e 100644 (file)
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -21,7 +21,7 @@ package org.linphone.core;
 import java.io.File;
 import java.io.IOException;
 
-import org.linphone.CpuUtils;
+import org.linphone.mediastream.CpuUtils;
 import org.linphone.mediastream.Version;
 
 import android.util.Log;
@@ -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("linphonex86"); 
                } else {
-                       System.loadLibrary("linphone"); 
+                       Log.d("linphone", "No-neon armv5 liblinphone loaded");
+                       System.loadLibrary("linphonearmv5noneon"); 
                }
 
                Version.dumpCapabilities();
@@ -105,6 +105,11 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
        public LinphoneAddress createLinphoneAddress(String identity) {
                return new LinphoneAddressImpl(identity);
        }
+       
+       @Override
+       public LpConfig createLpConfig(String file) {
+               return new LpConfigImpl(file);
+       }
 
        @Override
        public LinphoneCore createLinphoneCore(LinphoneCoreListener listener,
@@ -161,4 +166,10 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
        {
                return System.getProperty("os.arch").contains("armv7");
        }
+
+       @Override
+       public LinphoneAuthInfo createAuthInfo(String username, String userid,
+                       String passwd, String ha1, String realm) {
+               return new LinphoneAuthInfoImpl(username,userid,passwd,ha1,realm);
+       }
 }