Enable SkUtilsArm on all ARM platforms and always use NDK compliant NEON detection on Android.

R=scroggo@google.com

Review URL: https://codereview.chromium.org/22193002

git-svn-id: http://skia.googlecode.com/svn/trunk@10530 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2013-08-05 13:38:28 +00:00
parent 1a165aa485
commit 6a6c80c6e3
2 changed files with 5 additions and 3 deletions

View File

@ -79,11 +79,13 @@
'sources': [
'../src/core/SkPaintOptionsAndroid.cpp',
],
'dependencies': [
'android_deps.gyp:cpu_features',
],
}],
[ 'skia_os == "android" and skia_arch_type == "arm"', {
[ 'skia_arch_type == "arm"', {
# The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
'sources': [
'../src/core/SkPaintOptionsAndroid.cpp',
'../src/core/SkUtilsArm.cpp',
'../src/core/SkUtilsArm.h',
],

View File

@ -20,7 +20,7 @@
// cpu-features helper library to detect NEON at runtime. See
// http://crbug.com/164154 to see why this is needed in Chromium
// for Android.
#if defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_FOR_CHROMIUM)
#if defined(SK_BUILD_FOR_ANDROID)
# define USE_ANDROID_NDK_CPU_FEATURES 1
#else
# define USE_ANDROID_NDK_CPU_FEATURES 0