Fix skia build when not on armv7.

skia/skia.gyp

 # Copyright (c) 2012 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': '<(component)',
       'variables': {
@@ skipping 203 matching lines @@
       'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800],
       'defines': [
         #'SK_GAMMA_SRGB',
         #'SK_GAMMA_APPLY_TO_A8',
         'SK_BUILD_NO_IMAGE_ENCODE',
         'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
         'GR_STATIC_RECT_VB=1',
         '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',
 
         # temporary for landing Skia rev 3077 with minimal layout test breakage
         'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS',
 
         # skia uses static initializers to initialize the serialization logic
         # of its "pictures" library. This is currently not used in chrome; if
         # it ever gets used the processes that use it need to call
         # SkGraphics::Init().
@@ skipping 55 matching lines @@
             'SK_GAMMA_SRGB',
             'SK_GAMMA_CONTRAST=0.5',
           ],
         }],
         ['OS == "mac"', {
           'defines': [
             'SK_GAMMA_SRGB',
             '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"', {
           'defines+': [
             'SK_USE_POSIX_THREADS',
           ],
           'direct_dependent_settings': {
             'defines': [
               'SK_USE_POSIX_THREADS',
             ],
@@ skipping 405 matching lines @@
           # -fno-omit-frame-pointer flag for Android, as that gets added to all
           # targets via common.gypi.
           'cflags!': [
             '-fno-omit-frame-pointer',
           ],
           '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/SkBlitRow_opts_arm.h',
-            '../third_party/skia/src/opts/opts_check_arm.cpp',
           ],
         }],
         [ 'armv7 == 1 and arm_neon == 0', {
           'sources': [
             '../third_party/skia/src/opts/memset.arm.S',
         ],
         }],
         [ 'armv7 == 1 and arm_neon == 1', {
           'sources': [
             '../third_party/skia/src/opts/memset16_neon.S',
             '../third_party/skia/src/opts/memset32_neon.S',
             '../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
             '../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',
           ],
         }],
       ],
     },
     # For the same lame reasons as what is done for skia_opts, we have to
     # create another target specifically for SSSE3 code as we would not want
     # to compile the SSE2 code with -mssse3 which would potentially allow
     # gcc to generate SSSE3 code.
     {
       'target_name': 'skia_opts_ssse3',
@@ skipping 75 matching lines @@
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
           ],
         },
       ],
     }],
   ],
 }