Renamed android libraries to avoid confusion

diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index d8e75ca0b9aeb9805bc395ed313008bd351e3fe8..061a962179c6b8082d53a10b9750ae58d10e11d7 100644 (file)
--- 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 10fba32dde675a67c35a4270ea8fa2491a2df79c..0dc0bd041fe283c94e62fdf9516692e8263dddb9 100755 (executable)
--- 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 0b799f33ee169bac41f0890068e96af85e64d1d2..1d14ceb1447eb742154ce4461b3250c81c6188c8 100644 (file)
--- 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();