Update from https://crrev.com/314320

skia/skia_library.gypi

 # Copyright 2013 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.
 
 
 # This gypi file contains the Skia library.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Chrome-specific enhancements but in all other cases it is a separate lib.
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ skipping 14 matching lines @@
   ],
 
   'sources': [
     # this should likely be moved into src/utils in skia
     '../third_party/skia/src/core/SkFlate.cpp',
 
     '../third_party/skia/src/ports/SkImageDecoder_empty.cpp',
     '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
     '../third_party/skia/src/images/SkScaledBitmapSampler.h',
 
-    '../third_party/skia/src/opts/opts_check_x86.cpp',
-
     '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
 
     '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
     '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
 
     '../third_party/skia/src/fonts/SkFontMgr_indirect.cpp',
     '../third_party/skia/src/fonts/SkRemotableFontMgr.cpp',
     '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp',
 
     '../third_party/skia/src/ports/SkImageGenerator_none.cpp',
@@ skipping 171 matching lines @@
       ],
     }],
     [ 'OS == "android" and target_arch == "arm"', {
       'sources': [
         '../third_party/skia/src/core/SkUtilsArm.cpp',
       ],
       'includes': [
         '../build/android/cpufeatures.gypi',
       ],
     }],
-    [ 'target_arch == "arm" or target_arch == "arm64" or \
-       target_arch == "mipsel" or target_arch == "mips64el"', {
-      'sources!': [
-        '../third_party/skia/src/opts/opts_check_x86.cpp'
-      ],
-    }],
     [ 'desktop_linux == 1 or chromeos == 1', {
       'dependencies': [
         '../build/linux/system.gyp:fontconfig',
         '../build/linux/system.gyp:freetype2',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'cflags': [
         '-Wno-unused',
         '-Wno-unused-function',
       ],
@@ skipping 38 matching lines @@
         'libraries': [
           '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework',
         ],
       },
       'sources': [
         # This file is used on both iOS and Mac, so it should be removed
         #  from the ios and mac conditions and moved into the main sources
         #  list.
         '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
       ],
-      'sources/': [
-        ['exclude', 'opts_check_x86\\.cpp$'],
-      ],
 
       # The main skia_opts target does not currently work on iOS because the
       # target architecture on iOS is determined at compile time rather than
       # gyp time (simulator builds are x86, device builds are arm).  As a
       # temporary measure, this is a separate opts target for iOS-only, using
       # the _none.cpp files to avoid architecture-dependent implementations.
       'dependencies': [
         'skia_library_opts.gyp:skia_opts_none',
       ],
       'dependencies!': [
@@ skipping 76 matching lines @@
       '../third_party/skia/include/pdf',
       '../third_party/skia/include/gpu',
       '../third_party/skia/include/lazy',
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
   },
 }