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

Remove useless libneon.

Browse source
This commit is contained in:
Ghislain MARY 2013-10-02 16:06:30 +02:00
parent 9be503e02c
commit 554e149574
4 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
jni/Android.mk
View file

@ -1,8 +1,5 @@
# script expect linphone-root-dir variable to be set by parent ! # script expect linphone-root-dir variable to be set by parent !
include $(linphone-root-dir)/submodules/linphone/mediastreamer2/src/android/libneon/Android.mk
#enable video on armv7 and x86 targets only #enable video on armv7 and x86 targets only
#since we want to modify BUILD_VIDEO and BUILD_X264 depending on platform, we need to make a copy because the #since we want to modify BUILD_VIDEO and BUILD_X264 depending on platform, we need to make a copy because the
#variables given on command line take precedence over the ones defined internally. #variables given on command line take precedence over the ones defined internally.

2
jni/Application.mk
View file

@ -1,5 +1,5 @@
APP_PROJECT_PATH := $(call my-dir)/../ APP_PROJECT_PATH := $(call my-dir)/../
APP_MODULES :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone libneon liblpxml2 APP_MODULES :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblpxml2
APP_STL := stlport_static APP_STL := stlport_static
#default values: #default values:

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

@ -3,7 +3,6 @@ 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 org.linphone.mediastream.CpuUtils;
import android.util.Log; import android.util.Log;
@ -19,12 +18,6 @@ public class Tester {
return false; return false;
} }
public static boolean hasNeonInCpuFeatures()
{
CpuUtils cpu = new CpuUtils();
return cpu.isCpuNeon();
}
public static boolean isArmv7() public static boolean isArmv7()
{ {
return System.getProperty("os.arch").contains("armv7"); return System.getProperty("os.arch").contains("armv7");

2
submodules/linphone

@ -1 +1 @@
Subproject commit e8668e2e312c390e891c372e3237ba3e6a54f53a Subproject commit 3878b016ab2bc97f1064b009065fd791044cb73a