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

libneon is in mediastreamer2.

Browse source
This commit is contained in:
Ghislain MARY 2013-05-02 10:25:48 +02:00
parent 44524d6698
commit c554ebb4e8
3 changed files with 1 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/Android.mk
View file

@ -19,7 +19,7 @@ LINPHONE_VIDEO=0
BUILD_X264=0 BUILD_X264=0
endif 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 ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)

37
jni/libneon/Android.mk
View file

@ -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)

37
jni/libneon/libneon_jni.cc
View file

@ -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;
}
}