diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-02-20 17:06:07 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-21 03:31:14 +0000 |
| commit | 483c772cfdd646fad3ae8aa187136191ae3babdc (patch) | |
| tree | 6bfe0818629abcf41fab36a48daeb0327e2ec6a4 /BUILD.gn | |
| parent | 14b7375aa648ef88135396ec14296aa676f40004 (diff) | |
Add nativeFonts flag to Viewer.
This moves DMFontMgr and several related files which are tightly related
to fonts into tools/fonts, moves some flags around to prevent
duplication, and adds the nativeFonts handling to Viewer.
Change-Id: Id1bdad708a6b74319ac5ac9adfe21025db4ca0b2
Reviewed-on: https://skia-review.googlesource.com/108904
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1236,6 +1236,7 @@ if (skia_enable_tools) { public_include_dirs = [ "tools", "tools/debugger", + "tools/fonts", "tools/timer", "tools/trace", ] @@ -1245,8 +1246,6 @@ if (skia_enable_tools) { "tools/LsanSuppressions.cpp", "tools/ProcStats.cpp", "tools/Resources.cpp", - "tools/SkRandomScalerContext.cpp", - "tools/SkTestScalerContext.cpp", "tools/UrlDataManager.cpp", "tools/debugger/SkDebugCanvas.cpp", "tools/debugger/SkDrawCommand.cpp", @@ -1255,7 +1254,10 @@ if (skia_enable_tools) { "tools/picture_utils.cpp", "tools/random_parse_path.cpp", "tools/sk_tool_utils.cpp", - "tools/sk_tool_utils_font.cpp", + "tools/fonts/sk_tool_utils_font.cpp", + "tools/fonts/SkRandomScalerContext.cpp", + "tools/fonts/SkTestScalerContext.cpp", + "tools/fonts/SkTestFontMgr.cpp", "tools/timer/Timer.cpp", "tools/trace/SkChromeTracingTracer.cpp", "tools/trace/SkChromeTracingTracer.h", @@ -1511,7 +1513,6 @@ if (skia_enable_tools) { test_app("dm") { sources = [ "dm/DM.cpp", - "dm/DMFontMgr.cpp", "dm/DMGpuTestProcs.cpp", "dm/DMJsonWriter.cpp", "dm/DMSrcSink.cpp", @@ -1629,7 +1630,7 @@ if (skia_enable_tools) { test_app("create_test_font") { sources = [ - "tools/create_test_font.cpp", + "tools/fonts/create_test_font.cpp", ] deps = [ ":skia", @@ -1789,7 +1790,6 @@ if (skia_enable_tools) { defines += [ "SK_SKQP_ENABLE_DRIVER_CORRECTNESS_WORKAROUNDS" ] } sources = [ - "dm/DMFontMgr.cpp", "dm/DMGpuTestProcs.cpp", "tools/skqp/gm_knowledge.cpp", "tools/skqp/gm_runner.cpp", |