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

BUG=

Review URL: https://codereview.chromium.org/327523002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276188 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 173 insertions, 74 deletions

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 74f6843..7f9f974 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -56,6 +56,15 @@ gypi_skia_effects = exec_script(
     "scope",
     [ "//third_party/skia/gyp/effects.gypi" ])
 
+# The list of Skia utilss that are to be set for chromium.
+gypi_skia_utils = exec_script(
+    "//build/gypi_to_gn.py",
+    [ rebase_path("//third_party/skia/gyp/utils.gypi"),
+      "--replace=<(skia_include_path)=//third_party/skia/include",
+      "--replace=<(skia_src_path)=//third_party/skia/src" ],
+    "scope",
+    [ "//third_party/skia/gyp/utils.gypi" ])
+
 # The list of Skia files is kept in skia_gn_files.gypi. Read it.
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
@@ -295,6 +304,7 @@ component("skia") {
   # The skia gypi values are relative to the skia_dir, so we need to rebase.
   sources += gypi_skia_core.sources
   sources += gypi_skia_effects.sources
+  sources += gypi_skia_utils.sources
   sources += gypi_skia_pdf.sources
   sources += gypi_values.skia_library_sources
 
@@ -304,6 +314,90 @@ component("skia") {
     sources += gypi_skia_gpu.skgpu_null_gl_sources
   }
 
+  # Remove unused util files include in utils.gypi
+  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/SkTFitsIn.h",
+  "//third_party/skia/src/utils/SkTLogic.h",
+
+  #testing
+  "//third_party/skia/src/fonts/SkGScalerContext.cpp",
+  "//third_party/skia/src/fonts/SkGScalerContext.h",
+  ]
+
+  # need separate win section to handle chromes auto gn filter (build/config/BUILDCONFIG.gn)
+  if (is_win) {
+    sources -= [
+      "//third_party/skia/src/utils/SkThreadUtils_win.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",
+    ]
+  }
+
   # Fixup Chrome sources.
   if (is_posix) {
     sources -= [ "ext/SkThread_chrome.cc" ]
diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi
index bcec6e8..13a6f42 100644
--- a/skia/skia_gn_files.gypi
+++ b/skia/skia_gn_files.gypi
@@ -8,15 +8,6 @@
     '<(skia_include_path)/images/SkMovie.h',
     '<(skia_include_path)/images/SkPageFlipper.h',
     '<(skia_include_path)/ports/SkTypeface_win.h',
-    '<(skia_include_path)/utils/mac/SkCGUtils.h',
-    '<(skia_include_path)/utils/SkDeferredCanvas.h',
-    '<(skia_include_path)/utils/SkEventTracer.h',
-    '<(skia_include_path)/utils/SkMatrix44.h',
-    '<(skia_include_path)/utils/SkNullCanvas.h',
-    '<(skia_include_path)/utils/SkNWayCanvas.h',
-    '<(skia_include_path)/utils/SkPictureUtils.h',
-    '<(skia_include_path)/utils/SkProxyCanvas.h',
-    '<(skia_include_path)/utils/SkRTConf.h',
     '<(skia_src_path)/fonts/SkFontMgr_fontconfig.cpp',
     '<(skia_src_path)/fonts/SkFontMgr_indirect.cpp',
     '<(skia_src_path)/fonts/SkRemotableFontMgr.cpp',
@@ -56,43 +47,11 @@
     '<(skia_src_path)/utils/debugger/SkDrawCommand.h',
     '<(skia_src_path)/utils/debugger/SkObjectParser.cpp',
     '<(skia_src_path)/utils/debugger/SkObjectParser.h',
-    '<(skia_src_path)/utils/SkBase64.cpp',
-    '<(skia_src_path)/utils/SkBase64.h',
-    '<(skia_src_path)/utils/SkBitSet.cpp',
-    '<(skia_src_path)/utils/SkBitSet.h',
-    '<(skia_src_path)/utils/SkCanvasStack.cpp',
-    '<(skia_src_path)/utils/SkCanvasStateUtils.cpp',
-    '<(skia_src_path)/utils/SkEventTracer.cpp',
-    '<(skia_src_path)/utils/SkDeferredCanvas.cpp',
-    '<(skia_src_path)/utils/SkMatrix22.cpp',
-    '<(skia_src_path)/utils/SkMatrix22.h',
-    '<(skia_src_path)/utils/SkMatrix44.cpp',
-    '<(skia_src_path)/utils/SkNullCanvas.cpp',
-    '<(skia_src_path)/utils/SkNWayCanvas.cpp',
-    '<(skia_src_path)/utils/SkPictureUtils.cpp',
-    '<(skia_src_path)/utils/SkProxyCanvas.cpp',
-    '<(skia_src_path)/utils/SkRTConf.cpp',
 
     #mac
-    '<(skia_include_path)/utils/mac/SkCGUtils.h',
-    '<(skia_src_path)/utils/mac/SkCreateCGImageRef.cpp',
     '<(skia_src_path)/utils/mac/SkStream_mac.cpp',
 
     #windows
-    '<(skia_include_path)/utils/win/SkAutoCoInitialize.h',
-    '<(skia_include_path)/utils/win/SkHRESULT.h',
-    '<(skia_include_path)/utils/win/SkIStream.h',
-    '<(skia_include_path)/utils/win/SkTScopedComPtr.h',
-    '<(skia_src_path)/utils/win/SkAutoCoInitialize.cpp',
-    '<(skia_src_path)/utils/win/SkDWrite.h',
-    '<(skia_src_path)/utils/win/SkDWrite.cpp',
-    '<(skia_src_path)/utils/win/SkDWriteFontFileStream.cpp',
-    '<(skia_src_path)/utils/win/SkDWriteFontFileStream.h',
-    '<(skia_src_path)/utils/win/SkDWriteGeometrySink.cpp',
-    '<(skia_src_path)/utils/win/SkDWriteGeometrySink.h',
-    '<(skia_src_path)/utils/win/SkHRESULT.cpp',
-    '<(skia_src_path)/utils/win/SkIStream.cpp',
-    '<(skia_src_path)/utils/win/SkWGL_win.cpp',
 
     #testing
     '<(skia_src_path)/fonts/SkGScalerContext.cpp',
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index a201518..b56a827 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -22,6 +22,7 @@
     '../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': [
@@ -70,42 +71,12 @@
     '../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',
@@ -116,11 +87,86 @@
     '../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/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/include/utils/SkNullCanvas.h',
-    '../third_party/skia/include/utils/SkPictureUtils.h',
-    '../third_party/skia/include/utils/SkProxyCanvas.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',