Separate neon flags from armv7, because some platforms have armv7a but no neon.

skia/skia.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(library)',
       'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
@@ skipping 561 matching lines @@
             '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
             '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
             '../third_party/skia/src/ports/SkFontHost_tables.cpp',
           ],
         }],
         [ 'OS != "win"', {
           'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
         }],
         [ 'armv7 == 1', {
           'defines': [
+            '__ARM_ARCH__=7',
+          ],
+        }],
+        [ 'armv7 == 1 and arm_neon == 1', {
+          'defines': [
             '__ARM_HAVE_NEON',
-            '__ARM_ARCH__=7',
           ],
         }],
         [ 'target_arch == "arm"', {
           'sources!': [
             '../third_party/skia/src/opts/opts_check_SSE2.cpp'
           ],
         }],
         [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
           'dependencies': [
             '../build/linux/system.gyp:gdk',
@@ skipping 103 matching lines @@
         }],
         [ 'target_arch != "arm"', {
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
           ],
         },
         {  # arm
           'conditions': [
-            ['armv7 == 1', {
+            [ 'armv7 == 1', {
+              'defines': [
+                '__ARM_ARCH__=7',
+              ],
+            }],
+            [ 'armv7 == 1 and arm_neon == 1', {
               'defines': [
                 '__ARM_HAVE_NEON',
-                '__ARM_ARCH__=7',
               ],
-            }]
+            }],
           ],
           # The assembly uses the frame pointer register (r7 in Thumb/r11 in
           # ARM), the compiler doesn't like that.
           'cflags': [
             '-fomit-frame-pointer',
           ],
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
           ],
         }],
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: