Commit 7354b123 authored by Sylvain Berfini's avatar Sylvain Berfini
Browse files

Renamed android libraries to avoid confusion

parent b6670789
......@@ -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)
......
......@@ -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)
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment