From c554ebb4e8afea2d986d7fcf69ac01c62b3ab0e1 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 2 May 2013 10:25:48 +0200
Subject: [PATCH] libneon is in mediastreamer2.

---
 jni/Android.mk             |  2 +-
 jni/libneon/Android.mk     | 37 -------------------------------------
 jni/libneon/libneon_jni.cc | 37 -------------------------------------
 3 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100755 jni/libneon/Android.mk
 delete mode 100644 jni/libneon/libneon_jni.cc

diff --git a/jni/Android.mk b/jni/Android.mk
index ccd880d7c..4bf687525 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -19,7 +19,7 @@ LINPHONE_VIDEO=0
 BUILD_X264=0
 endif
 
-include $(linphone-root-dir)/jni/libneon/Android.mk
+include $(linphone-root-dir)/submodules/linphone/mediastreamer2/src/android/libneon/Android.mk
 
 ##ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
diff --git a/jni/libneon/Android.mk b/jni/libneon/Android.mk
deleted file mode 100755
index dbdb0078f..000000000
--- a/jni/libneon/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-##
-## Android.mk -Android build script-
-##
-##
-## Copyright (C) 2010  Belledonne Communications, Grenoble, France
-##
-##  This program is free software; you can redistribute it and/or modify
-##  it under the terms of the GNU General Public License as published by
-##  the Free Software Foundation; either version 2 of the License, or
-##  (at your option) any later version.
-##
-##  This program is distributed in the hope that it will be useful,
-##  but WITHOUT ANY WARRANTY; without even the implied warranty of
-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-##  GNU General Public License for more details.
-##
-##  You should have received a copy of the GNU General Public License
-##  along with this program; if not, write to the Free Software
-##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := \
-	libneon_jni.cc
-	
-LOCAL_STATIC_LIBRARIES := cpufeatures
-
-LOCAL_MODULE := libneon
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,android/cpufeatures)
diff --git a/jni/libneon/libneon_jni.cc b/jni/libneon/libneon_jni.cc
deleted file mode 100644
index 763723cf0..000000000
--- a/jni/libneon/libneon_jni.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-libneon_jni.cc
-Copyright (C) 2013  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <jni.h>
-
-extern "C" {
-#include <cpu-features.h>
-#include <android/log.h>
-
-static JavaVM *jvm=0;
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *ajvm, void *reserved)
-{
-	jvm=ajvm;
-	return JNI_VERSION_1_2;
-}
-
-extern "C" jboolean Java_org_linphone_mediastream_CpuUtils_hasNeon(JNIEnv* env, jobject thiz) {
-	return android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON;
-}
-}