mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 05:38:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Name ffmpeg and linphone shared libraries according to arch ABI.

Browse source
This commit is contained in:
Ghislain MARY 2013-10-03 16:40:35 +02:00
parent ebb0699eec
commit 946bb08733
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/android/Android.mk
View file

@ -33,6 +33,7 @@ LOCAL_SHARED_LIBRARIES += \
endif
LOCAL_MODULE := liblinphone
LOCAL_MODULE_FILENAME := liblinphone-$(TARGET_ARCH_ABI)
include $(BUILD_SHARED_LIBRARY)

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

@ -38,12 +38,23 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
}
static {
System.loadLibrary("neon");
String eabi = "arm";
if (Version.isX86()) {
eabi = "x86";
} else if (Version.isArmv7()) {
eabi = "armeabi-v7a";
}
// FFMPEG (audio/video)
loadOptionalLibrary("avutil-linphone");
loadOptionalLibrary("swscale-linphone");
loadOptionalLibrary("avcodec-linphone");
if (Version.isX86()) {
loadOptionalLibrary("avutil-linphone-x86");
loadOptionalLibrary("swscale-linphone-x86");
loadOptionalLibrary("avcodec-linphone-x86");
} else if (Version.isArmv7()) {
loadOptionalLibrary("avutil-linphone-arm");
loadOptionalLibrary("swscale-linphone-arm");
loadOptionalLibrary("avcodec-linphone-arm");
}
// OPENSSL (cryptography)
// lin prefix avoids collision with libs in /system/lib
@ -61,7 +72,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
loadOptionalLibrary("bcg729");
//Main library
System.loadLibrary("linphone");
System.loadLibrary("linphone-" + eabi);
Version.dumpCapabilities();
}