Fix load of libraries in liblinphone_tester
This commit is contained in:
parent
777fd05999
commit
ef0bb375a9
1 changed files with 9 additions and 19 deletions
|
@ -29,26 +29,16 @@ public class Tester {
|
||||||
String ffmpegAbi;
|
String ffmpegAbi;
|
||||||
boolean libLoaded=false;
|
boolean libLoaded=false;
|
||||||
Throwable firstException=null;
|
Throwable firstException=null;
|
||||||
for (String abi : cpuabis){
|
|
||||||
Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi);
|
|
||||||
loadOptionalLibrary("ffmpeg-linphone-" + abi);
|
|
||||||
//Main library
|
|
||||||
try {
|
|
||||||
System.loadLibrary("bctoolbox-" + abi);
|
|
||||||
System.loadLibrary("bctoolbox-tester-" + abi);
|
|
||||||
System.loadLibrary("ortp-" + abi);
|
|
||||||
System.loadLibrary("mediastreamer_base-" + abi);
|
|
||||||
System.loadLibrary("mediastreamer_voip-" + abi);
|
|
||||||
System.loadLibrary("linphone-" + abi);
|
|
||||||
System.loadLibrary("linphonetester-" + abi);
|
|
||||||
|
|
||||||
Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
|
loadOptionalLibrary("ffmpeg-linphone");
|
||||||
|
System.loadLibrary("bctoolbox");
|
||||||
|
System.loadLibrary("bctoolbox-tester");
|
||||||
|
System.loadLibrary("ortp");
|
||||||
|
System.loadLibrary("mediastreamer_base");
|
||||||
|
System.loadLibrary("mediastreamer_voip");
|
||||||
|
System.loadLibrary("linphone");
|
||||||
|
System.loadLibrary("linphonetester");
|
||||||
libLoaded=true;
|
libLoaded=true;
|
||||||
break;
|
|
||||||
}catch(Throwable e) {
|
|
||||||
if (firstException == null) firstException=e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!libLoaded){
|
if (!libLoaded){
|
||||||
throw new RuntimeException(firstException);
|
throw new RuntimeException(firstException);
|
||||||
|
|
Loading…
Reference in a new issue