Skia roll 0c88d82:a17aac8 with fixed build exclusions.

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 10 matching lines @@
     '../third_party/skia/gyp/core.gypi',
     '../third_party/skia/gyp/effects.gypi',
     '../third_party/skia/gyp/pdf.gypi',
     '../third_party/skia/gyp/record.gypi',
     '../third_party/skia/gyp/utils.gypi',
   ],
 
   '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',
@@ skipping 40 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/include/utils/SkCondVar.h',
-  '../third_party/skia/include/utils/SkCountdown.h',
-  '../third_party/skia/include/utils/SkRunnable.h',
-  '../third_party/skia/include/utils/SkThreadPool.h',
   '../third_party/skia/src/utils/SkCondVar.cpp',
-  '../third_party/skia/src/utils/SkCountdown.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',
@@ skipping 271 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',
     ],
   },
 }