From 53d878f7647dc65bb810b3b56750afc6cfc99133 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Fri, 1 Jun 2012 09:45:47 +0200
Subject: [PATCH] Fix armv6 loadling liblinphone issue

---
 AndroidManifest.xml                                | 4 +---
 src/org/linphone/core/LinphoneCoreFactoryImpl.java | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 43492dca1..10c22e27a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="1220" android:versionName="1.2.2"  android:installLocation="auto"> 
+      android:versionCode="1310" android:versionName="1.3.1"  android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="4"/>
 
-
-
     <!-- Don't remove the space after android:debuggable: it prevents ndk-build to try including gdbserver and crash gcc -->
     <application android:label="@string/app_name" android:debuggable ="true" android:icon="@drawable/logo_linphone_57x57">
 
diff --git a/src/org/linphone/core/LinphoneCoreFactoryImpl.java b/src/org/linphone/core/LinphoneCoreFactoryImpl.java
index baed45873..7d0be46e3 100644
--- a/src/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/src/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -71,7 +71,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 		//Main library
 		if (!hasNeonInCpuFeatures()) {
 			try {
-				if (isArmv5()) {
+				if (!isArmv7()) {
 					System.loadLibrary("linphonearmv5"); 
 				} else {
 					System.loadLibrary("linphonenoneon"); 
@@ -175,8 +175,8 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 		return result;
 	}
 	
-	public static boolean isArmv5()
+	public static boolean isArmv7()
 	{
-		return System.getProperty("os.arch").contains("armv5");
+		return System.getProperty("os.arch").contains("armv7");
 	}
 }