diff options
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 78a71ac..d9fb72e 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -577,10 +577,14 @@ }], [ 'armv7 == 1', { 'defines': [ - '__ARM_HAVE_NEON', '__ARM_ARCH__=7', ], }], + [ 'armv7 == 1 and arm_neon == 1', { + 'defines': [ + '__ARM_HAVE_NEON', + ], + }], [ 'target_arch == "arm"', { 'sources!': [ '../third_party/skia/src/opts/opts_check_SSE2.cpp' @@ -702,12 +706,16 @@ }, { # arm 'conditions': [ - ['armv7 == 1', { + [ 'armv7 == 1', { 'defines': [ - '__ARM_HAVE_NEON', '__ARM_ARCH__=7', ], - }] + }], + [ 'armv7 == 1 and arm_neon == 1', { + 'defines': [ + '__ARM_HAVE_NEON', + ], + }], ], # The assembly uses the frame pointer register (r7 in Thumb/r11 in # ARM), the compiler doesn't like that. |