Update from chromium https://crrev.com/302282

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 70 matching lines @@
     '../third_party/skia/include/ports/SkFontConfigInterface.h',
     '../third_party/skia/include/ports/SkFontMgr.h',
     '../third_party/skia/include/ports/SkFontMgr_indirect.h',
     '../third_party/skia/include/ports/SkFontStyle.h',
     '../third_party/skia/include/ports/SkRemotableFontMgr.h',
     '../third_party/skia/include/ports/SkTypeface_win.h',
   ],
 
   # Exclude all unused files in skia utils.gypi file
   'sources!': [
-  '../third_party/skia/src/utils/SkCondVar.cpp',
-  '../third_party/skia/src/utils/SkCondVar.h',
-  '../third_party/skia/src/utils/SkRunnable.h',
-
   '../third_party/skia/include/utils/SkBoundaryPatch.h',
   '../third_party/skia/include/utils/SkFrontBufferedStream.h',
   '../third_party/skia/include/utils/SkCamera.h',
   '../third_party/skia/include/utils/SkCanvasStateUtils.h',
   '../third_party/skia/include/utils/SkCubicInterval.h',
   '../third_party/skia/include/utils/SkCullPoints.h',
   '../third_party/skia/include/utils/SkDebugUtils.h',
   '../third_party/skia/include/utils/SkDumpCanvas.h',
   '../third_party/skia/include/utils/SkEventTracer.h',
   '../third_party/skia/include/utils/SkInterpolator.h',
@@ skipping 24 matching lines @@
   '../third_party/skia/src/utils/SkMD5.h',
   '../third_party/skia/src/utils/SkMeshUtils.cpp',
   '../third_party/skia/src/utils/SkNinePatch.cpp',
   '../third_party/skia/src/utils/SkOSFile.cpp',
   '../third_party/skia/src/utils/SkParse.cpp',
   '../third_party/skia/src/utils/SkParseColor.cpp',
   '../third_party/skia/src/utils/SkParsePath.cpp',
   '../third_party/skia/src/utils/SkPathUtils.cpp',
   '../third_party/skia/src/utils/SkSHA1.cpp',
   '../third_party/skia/src/utils/SkSHA1.h',
-  '../third_party/skia/src/utils/SkThreadUtils.h',
-  '../third_party/skia/src/utils/SkThreadUtils_pthread.cpp',
-  '../third_party/skia/src/utils/SkThreadUtils_pthread.h',
-  '../third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp',
-  '../third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp',
-  '../third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp',
-  '../third_party/skia/src/utils/SkThreadUtils_win.cpp',
-  '../third_party/skia/src/utils/SkThreadUtils_win.h',
   '../third_party/skia/src/utils/SkTFitsIn.h',
   '../third_party/skia/src/utils/SkTLogic.h',
 
+  # We don't currently need to change thread affinity, so leave out this complexity for now.
+  "../third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
+  "../third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
+
 #windows
   '../third_party/skia/include/utils/win/SkAutoCoInitialize.h',
   '../third_party/skia/include/utils/win/SkHRESULT.h',
   '../third_party/skia/include/utils/win/SkIStream.h',
   '../third_party/skia/include/utils/win/SkTScopedComPtr.h',
   '../third_party/skia/src/utils/win/SkAutoCoInitialize.cpp',
   '../third_party/skia/src/utils/win/SkIStream.cpp',
   '../third_party/skia/src/utils/win/SkWGL_win.cpp',
 
 #testing
@@ skipping 39 matching lines @@
       'sources/': [
         ['exclude', '../third_party/skia/src/pdf/']
       ],
     }],
     ['skia_support_pdf == 1', {
       'dependencies': [
         '../third_party/sfntly/sfntly.gyp:sfntly',
       ],
     }],
 
+    [ 'OS == "win"', {
+      'sources!': [
+        # Keeping _win.cpp
+        "../third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
+        "../third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp",
+      ],
+    },{
+      'sources!': [
+        # Keeping _pthread.cpp and _pthread_other.cpp
+        "../third_party/skia/src/utils/SkThreadUtils_win.cpp",
+      ],
+    }],
+
     [ 'OS != "mac"', {
       'sources/': [
         ['exclude', '/mac/']
       ],
     }],
     [ 'OS == "android" and target_arch == "arm"', {
       'sources': [
         '../third_party/skia/src/core/SkUtilsArm.cpp',
       ],
       'includes': [
@@ skipping 149 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',
     ],
   },
 }