commit 0c5fdcb18986b46ddad48f4157570c4ead4fe54a
author Mike Klein <mtklein@chromium.org> Mon Nov 13 12:40:46 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 13 18:47:11 2017 +0000
tree cd0ed911d743e8a5ea92239c979e6dae1a48becb
parent 4c723832df5d1a1368c996d8f8349becd395ad90

streamline GDI bots

 - Replace build-time GDI support in all of Skia
   with run-time GDI support only in DM.

 - Make the GDI bots NativeFont bots paralelling
   the other NativeFonts bots.

Change-Id: I424b20f6983d8a8ba8574650efefea2b8776bbe2
Reviewed-on: https://skia-review.googlesource.com/70721
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index f629c67..2a8b8d3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -21,7 +21,6 @@
   skia_use_expat = true
   skia_use_fontconfig = is_linux
   skia_use_freetype = is_android || is_fuchsia || is_linux
-  skia_use_gdi = false
   skia_use_icu = !is_fuchsia && !is_ios && !is_win  # TODO: Windows
   skia_use_libjpeg_turbo = true
   skia_use_libpng = true
@@ -785,6 +784,7 @@
       "src/ports/SkDebug_win.cpp",
       "src/ports/SkFontHost_win.cpp",
       "src/ports/SkFontMgr_win_dw.cpp",
+      "src/ports/SkFontMgr_win_dw_factory.cpp",
       "src/ports/SkImageEncoder_WIC.cpp",
       "src/ports/SkImageGeneratorWIC.cpp",
       "src/ports/SkOSFile_win.cpp",
@@ -793,20 +793,13 @@
       "src/ports/SkTLS_win.cpp",
       "src/ports/SkTypeface_win_dw.cpp",
     ]
-    if (skia_use_gdi) {
-      sources += [ "src/ports/SkFontMgr_win_gdi_factory.cpp" ]
-      libs += [
-        "Gdi32.lib",
-        "Usp10.lib",
-      ]
-    } else {
-      sources += [ "src/ports/SkFontMgr_win_dw_factory.cpp" ]
-    }
     libs += [
       "FontSub.lib",
+      "Gdi32.lib",
       "Ole32.lib",
       "OleAut32.lib",
       "User32.lib",
+      "Usp10.lib",
     ]
   } else {
     sources += [