Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

propagate android build changes to liblinphone_tester

Browse source
This commit is contained in:
Jehan Monnier 2013-10-08 13:07:29 +02:00
parent 22b0a59bf3
commit 342f1a7ee1
3 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
liblinphone_tester/jni/Application.mk
View file

@ -4,4 +4,4 @@ APP_PROJECT_PATH := $(LOCAL_PATH)/../
APP_BUILD_SCRIPT := $(LOCAL_PATH)/Android.mk APP_BUILD_SCRIPT := $(LOCAL_PATH)/Android.mk
APP_OPTIM := debug APP_OPTIM := debug
APP_MODULES += cunit liblinphone_tester liblinphone_testernoneon APP_MODULES += cunit liblinphone_tester

32
liblinphone_tester/src/org/linphone/tester/Tester.java
View file

@ -1,7 +1,6 @@
package org.linphone.tester; package org.linphone.tester;
import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreFactory;
import org.linphone.mediastream.Version; import org.linphone.mediastream.Version;
import android.util.Log; import android.util.Log;
@ -24,27 +23,24 @@ public class Tester {
} }
static { static {
LinphoneCoreFactory.instance(); LinphoneCoreFactory.instance();
System.loadLibrary("cunit"); System.loadLibrary("cunit");
String eabi = "armeabi";
//Main library if (Version.isX86()) {
if (!hasNeonInCpuFeatures()) { eabi = "x86";
try { } else if (Version.isArmv7()) {
if (!isArmv7() && !Version.isX86()) { eabi = "armeabi-v7a";
System.loadLibrary("linphone_testerarmv5");
} else {
System.loadLibrary("linphone_testernoneon");
}
} catch (UnsatisfiedLinkError ule) {
Log.w("linphone", "Failed to load no-neon liblinphone_tester, loading neon liblinphone_tester");
System.loadLibrary("linphone_tester");
}
} else {
System.loadLibrary("linphone_tester");
} }
try {
System.loadLibrary("linphone_tester-"+eabi);
} catch (UnsatisfiedLinkError ule) {
Log.w("linphone", "Failed to load liblinphone_tester-"+eabi);
System.loadLibrary("linphone_tester");
}
Version.dumpCapabilities(); Version.dumpCapabilities();
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 11187a8c2feec57637eb113b3ed820a35e8e6bfb Subproject commit 5a92742e56ade67b79400246a7f13b238960745f