Index: skia/BUILD.gn |
diff --git a/skia/BUILD.gn b/skia/BUILD.gn |
index 74f6843d3ba30bf512abee72ba8ff9ab78e227be..7f9f974e394add50ff972afadcbf49aeb5c00b93 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" ] |