commit 386b19e03f3915ae22f8c96029b10270e7faa75f
author dsinclair <dsinclair@chromium.org> Wed Jun 01 09:50:17 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jun 01 09:50:17 2016 -0700
tree b83bed9372aee167b6cb27f7a91d8c436031fe8b
parent e80e9f8fc221a7639b6a38bd46bc44bca26481d0

Fix Skia windows GN build

This CL updates the GN files so the Skia port will build on Windows. This does
not mean the functionaly is correct, just that the binaries link.

Review-Url: https://codereview.chromium.org/2032553002

skia/BUILD.gn

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 97f6d58..d83ca3a 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -311,11 +311,14 @@
     sources -= [
       "//third_party/skia/src/ports/SkOSFile_posix.cpp",
       "//third_party/skia/src/ports/SkTLS_pthread.cpp",
+      "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
+      "//third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp",
     ]
   } else {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_win.cpp",
       "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp",
+      "//third_party/skia/src/ports/SkFontMgr_win_dw_factory.cpp",
       "//third_party/skia/src/ports/SkOSFile_win.cpp",
       "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
       "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
@@ -334,15 +337,6 @@
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
 
-  if (!is_linux) {
-    sources -= [
-      "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
-      "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
-      "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
-    ]
-  }
-
   if (!is_linux && !is_android) {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",

skia/skia_gn_files.gypi

diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi
index 7f74959..f54ac03 100644
--- a/skia/skia_gn_files.gypi
+++ b/skia/skia_gn_files.gypi
@@ -15,6 +15,7 @@
     '<(skia_src_path)/ports/SkFontMgr_android_factory.cpp',
     '<(skia_src_path)/ports/SkFontMgr_android_parser.cpp',
     '<(skia_src_path)/ports/SkFontMgr_win_dw.cpp',
+    '<(skia_src_path)/ports/SkFontMgr_win_dw_factory.cpp',
     '<(skia_src_path)/ports/SkGlobalInitialization_default.cpp',
     '<(skia_src_path)/ports/SkImageEncoder_none.cpp',
     '<(skia_src_path)/ports/SkOSFile_posix.cpp',