diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-22 13:42:34 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-22 13:42:34 +0000 |
| commit | ab08437e39b3d1f52d45d04730c03391f22c20f7 (patch) | |
| tree | ce3d47af10e68618c48fa99526ad2e3c1d1483fd /gyp | |
| parent | 4885d500f160cdd617619cc76b7040f75e2d4c3b (diff) | |
Revert "Temporarily disable NEON on Android framework builds."
R=scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/294183002
git-svn-id: http://skia.googlecode.com/svn/trunk@14844 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/opts.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp index c3f7b1b7bf..3e319fcceb 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -102,8 +102,7 @@ }], [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \ or (skia_os == "ios") \ - or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"]) \ - or (skia_android_framework and skia_arch_type == "arm64")', { + or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', '../src/opts/SkBlitMask_opts_none.cpp', @@ -122,7 +121,7 @@ '-mno-apcs-frame', ] }], - [ 'skia_arch_type == "arm64" and skia_android_framework == 0', { + [ 'skia_arch_type == "arm64"', { 'sources': [ '../src/opts/SkBitmapProcState_arm_neon.cpp', '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', |