mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-03 11:49:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed android libraries to avoid confusion

Browse source
This commit is contained in:
Sylvain Berfini 2013-05-14 12:13:37 +02:00
parent b667078985
commit 7354b123c1
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/android/Android-no-neon.mk
View file

@ -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)

3
build/android/Android.mk
View file

@ -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)

24
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -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();