diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-05 13:38:28 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-05 13:38:28 +0000 |
| commit | 6a6c80c6e36cab04dc32fe69598da5820bc43693 (patch) | |
| tree | ea62a3163fefbff48b8c372bea4526e014fdcc3b /gyp | |
| parent | 1a165aa4858d38978b176b44c3dfd928921c544f (diff) | |
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
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gyp/core.gyp b/gyp/core.gyp index 14eda4bd3c..7d322a6287 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -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', ], |