From 554e1495741bba76c9df1e0ea9be9bd65013df74 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 2 Oct 2013 16:06:30 +0200 Subject: [PATCH] Remove useless libneon. --- jni/Android.mk | 3 --- jni/Application.mk | 2 +- liblinphone_tester/src/org/linphone/tester/Tester.java | 7 ------- submodules/linphone | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index b7abdccbd..5129999cc 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,8 +1,5 @@ # 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 #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. diff --git a/jni/Application.mk b/jni/Application.mk index db1ef90e7..4e3da3ff4 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,5 +1,5 @@ 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 #default values: diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java index 7f2a925c2..095a061c5 100644 --- a/liblinphone_tester/src/org/linphone/tester/Tester.java +++ b/liblinphone_tester/src/org/linphone/tester/Tester.java @@ -3,7 +3,6 @@ package org.linphone.tester; import org.linphone.core.LinphoneCoreFactory; import org.linphone.mediastream.Version; -import org.linphone.mediastream.CpuUtils; import android.util.Log; @@ -19,12 +18,6 @@ public class Tester { return false; } - public static boolean hasNeonInCpuFeatures() - { - CpuUtils cpu = new CpuUtils(); - return cpu.isCpuNeon(); - } - public static boolean isArmv7() { return System.getProperty("os.arch").contains("armv7"); diff --git a/submodules/linphone b/submodules/linphone index e8668e2e3..3878b016a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e8668e2e312c390e891c372e3237ba3e6a54f53a +Subproject commit 3878b016ab2bc97f1064b009065fd791044cb73a