Renamed liblinphonex86noneon to liblinphonex86

diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index 061a962179c6b8082d53a10b9750ae58d10e11d7..39818fbf4df97fca7c9733f611bdb96c71cedc85 100644 (file)
--- a/build/android/Android-no-neon.mk
+++ b/build/android/Android-no-neon.mk
@@ -41,7 +41,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_MODULE_FILENAME := liblinphonearmv7noneon
 endif
 ifeq ($(TARGET_ARCH_ABI),x86)
-LOCAL_MODULE_FILENAME := liblinphonex86noneon
+LOCAL_MODULE_FILENAME := liblinphonex86
 endif
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 1d14ceb1447eb742154ce4461b3250c81c6188c8..8cedba44575e83bea58aa680078a9fbdb97d976e 100644 (file)
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -81,7 +81,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
                        }
                } else if (Version.isX86()) {
                        Log.d("linphone", "No-neon x86 liblinphone loaded");
-                       System.loadLibrary("linphonex86noneon"); 
+                       System.loadLibrary("linphonex86"); 
                } else {
                        Log.d("linphone", "No-neon armv5 liblinphone loaded");
                        System.loadLibrary("linphonearmv5noneon");