From 9806cc6b5d0d76accbb2b91e9f104d321dc99f9f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Wed, 23 May 2012 17:38:16 +0200
Subject: [PATCH] Updated libs compilation

---
 LinphoneCoreFactoryImpl.java | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/LinphoneCoreFactoryImpl.java b/LinphoneCoreFactoryImpl.java
index 8cc721e9..baed4587 100644
--- 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");
+	}
 }
-- 
2.39.2