Fix skia build when not on armv7.

skia/skia.gyp

Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 747427c40043d4718c1d63057990636eb05327e8..077955f9b512497c90c231a792f4de003ecdb2a1 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -221,7 +221,7 @@
         'GR_AGGRESSIVE_SHADER_OPTS=1',
         'SK_DISABLE_FAST_AA_STROKE_RECT',
         'SK_DEFERRED_CANVAS_USES_GPIPE=1',
-        
+
         # this flag can be removed entirely once this has baked for a while
         'SK_ALLOW_OVER_32K_BITMAPS',
 
@@ -297,7 +297,7 @@
             'SK_GAMMA_CONTRAST=0.0',
           ],
         }],
-        
+
         # For POSIX platforms, prefer the Mutex implementation provided by Skia
         # since it does not generate static initializers.
         [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
@@ -723,9 +723,6 @@
           ],
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
-            '../third_party/skia/src/opts/opts_check_arm.cpp',
           ],
         }],
         [ 'armv7 == 1 and arm_neon == 0', {
@@ -742,14 +739,19 @@
             '../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h',
             '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
-        ],
+          ],
         }],
-        [ 'target_arch == "arm" and armv7 != 1', {
+        [ 'target_arch == "arm" and armv7 == 0', {
           'sources': [
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
+            '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
           ],
-          'sources!': [
+        }],
+        [ 'target_arch == "arm" and armv7 == 1', {
+          'sources': [
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
+            '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
+            '../third_party/skia/src/opts/opts_check_arm.cpp',
           ],
         }],
       ],