Change skia build files to use a utils.gypi instead of hardcoded files.

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!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # variables and defines should go in skia_common.gypi so they can be seen
 # by files listed here and in skia_library_opts.gypi.
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 {
   'dependencies': [
     'skia_library_opts.gyp:skia_opts',
     '../third_party/zlib/zlib.gyp:zlib',
   ],
 
   'includes': [
     '../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/core/SkPaintOptionsAndroid.cpp',
 
     '../third_party/skia/src/ports/SkImageDecoder_empty.cpp',
     '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
     '../third_party/skia/src/images/SkScaledBitmapSampler.h',
@@ skipping 28 matching lines @@
     '../third_party/skia/src/ports/SkTLS_pthread.cpp',
     '../third_party/skia/src/ports/SkTLS_win.cpp',
     '../third_party/skia/src/ports/SkTypeface_win_dw.cpp',
     '../third_party/skia/src/ports/SkTypeface_win_dw.h',
 
     '../third_party/skia/src/sfnt/SkOTTable_name.cpp',
     '../third_party/skia/src/sfnt/SkOTTable_name.h',
     '../third_party/skia/src/sfnt/SkOTUtils.cpp',
     '../third_party/skia/src/sfnt/SkOTUtils.h',
 
-    '../third_party/skia/include/utils/mac/SkCGUtils.h',
-    '../third_party/skia/include/utils/SkDeferredCanvas.h',
-    '../third_party/skia/include/utils/SkMatrix44.h',
-    '../third_party/skia/include/utils/SkNoSaveLayerCanvas.h',
     '../third_party/skia/src/utils/debugger/SkDebugCanvas.cpp',
     '../third_party/skia/src/utils/debugger/SkDebugCanvas.h',
     '../third_party/skia/src/utils/debugger/SkDrawCommand.cpp',
     '../third_party/skia/src/utils/debugger/SkDrawCommand.h',
     '../third_party/skia/src/utils/debugger/SkObjectParser.cpp',
     '../third_party/skia/src/utils/debugger/SkObjectParser.h',
-    '../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp',
-    '../third_party/skia/src/utils/SkBase64.cpp',
-    '../third_party/skia/src/utils/SkBase64.h',
-    '../third_party/skia/src/utils/SkBitSet.cpp',
-    '../third_party/skia/src/utils/SkBitSet.h',
-    '../third_party/skia/src/utils/SkCanvasStack.cpp',
-    '../third_party/skia/src/utils/SkCanvasStateUtils.cpp',
-    '../third_party/skia/src/utils/SkEventTracer.cpp',
-    '../third_party/skia/src/utils/SkDeferredCanvas.cpp',
-    '../third_party/skia/src/utils/SkMatrix22.cpp',
-    '../third_party/skia/src/utils/SkMatrix22.h',
-    '../third_party/skia/src/utils/SkMatrix44.cpp',
-    '../third_party/skia/src/utils/SkNullCanvas.cpp',
-    '../third_party/skia/include/utils/SkNWayCanvas.h',
-    '../third_party/skia/src/utils/SkNWayCanvas.cpp',
-    '../third_party/skia/src/utils/SkPictureUtils.cpp',
-    '../third_party/skia/src/utils/SkProxyCanvas.cpp',
-    '../third_party/skia/src/utils/SkRTConf.cpp',
-    '../third_party/skia/include/utils/SkRTConf.h',
-    '../third_party/skia/src/utils/win/SkDWrite.h',
-    '../third_party/skia/src/utils/win/SkDWrite.cpp',
-    '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp',
-    '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h',
-    '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp',
-    '../third_party/skia/src/utils/win/SkDWriteGeometrySink.h',
-    '../third_party/skia/src/utils/win/SkHRESULT.cpp',
 
     '../third_party/skia/include/images/SkMovie.h',
     '../third_party/skia/include/images/SkPageFlipper.h',
 
     '../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',
+  ],
 
-    '../third_party/skia/include/utils/SkNullCanvas.h',
-    '../third_party/skia/include/utils/SkPictureUtils.h',
-    '../third_party/skia/include/utils/SkProxyCanvas.h',
+  # Exclude all unused files in skia utils.gypi file

[bungeman-skia, 2014/06/09 15:39:03]

Doesn't this set of exclusions also need to be in the BUILD.gn 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/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',
+  '../third_party/skia/include/utils/SkLayer.h',
+  '../third_party/skia/include/utils/SkMeshUtils.h',
+  '../third_party/skia/include/utils/SkNinePatch.h',
+  '../third_party/skia/include/utils/SkParse.h',
+  '../third_party/skia/include/utils/SkParsePaint.h',
+  '../third_party/skia/include/utils/SkParsePath.h',
+  '../third_party/skia/include/utils/SkRandom.h',
+  '../third_party/skia/include/utils/SkWGL.h',
+
+  '../third_party/skia/src/utils/SkBitmapHasher.cpp',
+  '../third_party/skia/src/utils/SkBitmapHasher.h',
+  '../third_party/skia/src/utils/SkBoundaryPatch.cpp',
+  '../third_party/skia/src/utils/SkFrontBufferedStream.cpp',
+  '../third_party/skia/src/utils/SkCamera.cpp',
+  '../third_party/skia/src/utils/SkCanvasStack.h',
+  '../third_party/skia/src/utils/SkCubicInterval.cpp',
+  '../third_party/skia/src/utils/SkCullPoints.cpp',
+  '../third_party/skia/src/utils/SkDumpCanvas.cpp',
+  '../third_party/skia/src/utils/SkFloatUtils.h',
+  '../third_party/skia/src/utils/SkGatherPixelRefsAndRects.cpp',
+  '../third_party/skia/src/utils/SkGatherPixelRefsAndRects.h',
+  '../third_party/skia/src/utils/SkInterpolator.cpp',
+  '../third_party/skia/src/utils/SkLayer.cpp',
+  '../third_party/skia/src/utils/SkMD5.cpp',
+  '../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',
+
+#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
+  '../third_party/skia/src/fonts/SkGScalerContext.cpp',
+  '../third_party/skia/src/fonts/SkGScalerContext.h',
   ],
+
   'include_dirs': [
     '../third_party/skia/include/core',
     '../third_party/skia/include/effects',
     '../third_party/skia/include/images',
     '../third_party/skia/include/lazy',
     '../third_party/skia/include/pathops',
     '../third_party/skia/include/pdf',
     '../third_party/skia/include/pipe',
     '../third_party/skia/include/ports',
     '../third_party/skia/include/record',
@@ skipping 214 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',
     ],
   },
 }