mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Keep track of used ABI when loading Android libraries

Browse source
This commit is contained in:
Sylvain Berfini 2016-09-22 10:41:14 +02:00
parent 05d712ecdd
commit e5c5c45147
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,25 +30,25 @@ import org.linphone.mediastream.Version;
import org.linphone.tools.OpenH264DownloadHelper;
public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
public static String ABI;
private static boolean loadOptionalLibrary(String s) {
try {
System.loadLibrary(s);
return true;
} catch (Throwable e) {
android.util.Log.w("LinphoneCoreFactoryImpl", "Unable to load optional library " + s
+ ": " +e.getMessage());
android.util.Log.w("LinphoneCoreFactoryImpl", "Unable to load optional library " + s + ": " +e.getMessage());
}
return false;
}
static {
List<String> cpuabis=Version.getCpuAbis();
boolean libLoaded=false;
Throwable firstException=null;
List<String> cpuabis = Version.getCpuAbis();
boolean libLoaded = false;
Throwable firstException = null;
System.loadLibrary("gnustl_shared");
for (String abi : cpuabis){
//android.util.Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi);
for (String abi : cpuabis) {
android.util.Log.i("LinphoneCoreFactoryImpl", "Trying to load liblinphone for " + abi);
loadOptionalLibrary("ffmpeg-linphone-" + abi);
//Main library
try {
@ -57,11 +57,11 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
System.loadLibrary("mediastreamer_base-" + abi);
System.loadLibrary("mediastreamer_voip-" + abi);
System.loadLibrary("linphone-" + abi);
org.linphone.mediastream.Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
libLoaded=true;
ABI = abi;
libLoaded = true;
break;
}catch(Throwable e) {
if (firstException == null) firstException=e;
} catch(Throwable e) {
if (firstException == null) firstException = e;
}
}