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

skia/skia.gyp

Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index d85f2a1b2fe2af2b2fa5bbfc29f79c5d9054de10..27abe1c50654ddba327fa4b888f35633c9a89a25 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -579,10 +579,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'
@@ -704,12 +708,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.