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 /public.bzl | |
| 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 'public.bzl')
| -rw-r--r-- | public.bzl | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/public.bzl b/public.bzl index 0880254af5..41ecb2dc2d 100644 --- a/public.bzl +++ b/public.bzl @@ -438,16 +438,23 @@ DM_SRCS_ALL = struct( "tools/Resources.cpp", "tools/Resources.h", "tools/SkJSONCPP.h", - "tools/SkRandomScalerContext.cpp", - "tools/SkRandomScalerContext.h", - "tools/SkTestScalerContext.cpp", - "tools/SkTestScalerContext.h", "tools/UrlDataManager.cpp", "tools/UrlDataManager.h", "tools/debugger/*.cpp", "tools/debugger/*.h", "tools/flags/*.cpp", "tools/flags/*.h", + "tools/fonts/SkRandomScalerContext.cpp", + "tools/fonts/SkRandomScalerContext.h", + "tools/fonts/SkTestFontMgr.cpp", + "tools/fonts/SkTestFontMgr.h", + "tools/fonts/SkTestScalerContext.cpp", + "tools/fonts/SkTestScalerContext.h", + "tools/fonts/sk_tool_utils_font.cpp", + "tools/fonts/test_font_monospace.inc", + "tools/fonts/test_font_sans_serif.inc", + "tools/fonts/test_font_serif.inc", + "tools/fonts/test_font_index.inc", "tools/gpu/**/*.cpp", "tools/gpu/**/*.h", "tools/picture_utils.cpp", @@ -456,11 +463,6 @@ DM_SRCS_ALL = struct( "tools/random_parse_path.h", "tools/sk_tool_utils.cpp", "tools/sk_tool_utils.h", - "tools/sk_tool_utils_font.cpp", - "tools/test_font_monospace.inc", - "tools/test_font_sans_serif.inc", - "tools/test_font_serif.inc", - "tools/test_font_index.inc", "tools/timer/*.cpp", "tools/timer/*.h", "tools/trace/*.cpp", @@ -520,6 +522,7 @@ DM_INCLUDES = [ "tools", "tools/debugger", "tools/flags", + "tools/fonts", "tools/gpu", "tools/timer", "tools/trace", |