Updated libs compilation

diff --git a/LinphoneCoreFactoryImpl.java b/LinphoneCoreFactoryImpl.java
index 8cc721e90fa979684b747e49d1e9795c7c295819..baed458733f6ba82a2908512b10f07a63f35463b 100644 (file)
--- a/LinphoneCoreFactoryImpl.java
+++ b/LinphoneCoreFactoryImpl.java
@@ -40,22 +40,16 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 
        static {
                // FFMPEG (audio/video)
+               loadOptionalLibrary("avutil");
+               loadOptionalLibrary("swscale");
+               loadOptionalLibrary("avcore");
+               
                if (!hasNeonInCpuFeatures()) {
-                       boolean noNeonLibrariesLoaded = true;
-                       noNeonLibrariesLoaded = noNeonLibrariesLoaded && loadOptionalLibrary("avutilnoneon");
-                       noNeonLibrariesLoaded = noNeonLibrariesLoaded && loadOptionalLibrary("swscalenoneon");
-                       noNeonLibrariesLoaded = noNeonLibrariesLoaded && loadOptionalLibrary("avcorenoneon");
-                       noNeonLibrariesLoaded = noNeonLibrariesLoaded && loadOptionalLibrary("avcodecnoneon");
+                       boolean noNeonLibrariesLoaded = loadOptionalLibrary("avcodecnoneon");
                        if (!noNeonLibrariesLoaded) {
-                               loadOptionalLibrary("avutil");
-                               loadOptionalLibrary("swscale");
-                               loadOptionalLibrary("avcore");
                                loadOptionalLibrary("avcodec");
                        }
                } else {
-                       loadOptionalLibrary("avutil");
-                       loadOptionalLibrary("swscale");
-                       loadOptionalLibrary("avcore");
                        loadOptionalLibrary("avcodec");
                }
  
@@ -77,7 +71,11 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
                //Main library
                if (!hasNeonInCpuFeatures()) {
                        try {
-                               System.loadLibrary("linphonenoneon"); 
+                               if (isArmv5()) {
+                                       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");
@@ -176,4 +174,9 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
                }
                return result;
        }
+       
+       public static boolean isArmv5()
+       {
+               return System.getProperty("os.arch").contains("armv5");
+       }
 }