From 66dd5cec662d83030955966da96bb6addcde55f1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 14 May 2013 12:13:37 +0200
Subject: [PATCH] Renamed android libraries to avoid confusion

---
 build/android/Android-no-neon.mk              |  8 ++++++-
 build/android/Android.mk                      |  3 +++
 .../core/LinphoneCoreFactoryImpl.java         | 24 +++++++++----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index d8e75ca0..061a9621 100644
--- a/build/android/Android-no-neon.mk
+++ b/build/android/Android-no-neon.mk
@@ -35,7 +35,13 @@ endif
 
 LOCAL_MODULE := liblinphonenoneon
 ifeq ($(TARGET_ARCH_ABI),armeabi)
-LOCAL_MODULE_FILENAME := liblinphonearmv5
+LOCAL_MODULE_FILENAME := liblinphonearmv5noneon
+endif
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_MODULE_FILENAME := liblinphonearmv7noneon
+endif
+ifeq ($(TARGET_ARCH_ABI),x86)
+LOCAL_MODULE_FILENAME := liblinphonex86noneon
 endif
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/build/android/Android.mk b/build/android/Android.mk
index 10fba32d..0dc0bd04 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -34,6 +34,9 @@ LOCAL_SHARED_LIBRARIES += \
 endif
 
 LOCAL_MODULE := liblinphone
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_MODULE_FILENAME := liblinphonearmv7
+endif
 
 include $(BUILD_SHARED_LIBRARY)
 
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();
-- 
2.39.2