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

Fix armv6 loadling liblinphone issue

Browse source
This commit is contained in:
Sylvain Berfini 2012-06-01 09:45:47 +02:00
parent cd3361fb7b
commit 53d878f764
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone" package="org.linphone"
android:versionCode="1220" android:versionName="1.2.2" android:installLocation="auto"> android:versionCode="1310" android:versionName="1.3.1" android:installLocation="auto">
<uses-sdk android:minSdkVersion="4"/> <uses-sdk android:minSdkVersion="4"/>
<!-- Don't remove the space after android:debuggable: it prevents ndk-build to try including gdbserver and crash gcc --> <!-- Don't remove the space after android:debuggable: it prevents ndk-build to try including gdbserver and crash gcc -->
<application android:label="@string/app_name" android:debuggable ="true" android:icon="@drawable/logo_linphone_57x57"> <application android:label="@string/app_name" android:debuggable ="true" android:icon="@drawable/logo_linphone_57x57">

6
src/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -71,7 +71,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
//Main library //Main library
if (!hasNeonInCpuFeatures()) { if (!hasNeonInCpuFeatures()) {
try { try {
if (isArmv5()) { if (!isArmv7()) {
System.loadLibrary("linphonearmv5"); System.loadLibrary("linphonearmv5");
} else { } else {
System.loadLibrary("linphonenoneon"); System.loadLibrary("linphonenoneon");
@ -175,8 +175,8 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
return result; return result;
} }
public static boolean isArmv5() public static boolean isArmv7()
{ {
return System.getProperty("os.arch").contains("armv5"); return System.getProperty("os.arch").contains("armv7");
} }
} }