commit 1c3a7a06f16d80fbd79e45894589a4a2433a93bf
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Wed Feb 21 09:26:25 2018 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Wed Feb 21 09:26:25 2018 +0000
tree cbae8be6e78961607f3d9b78ab23c43908999141
parent 199bb03c3d1e7b6332b28c69ecb9a384686d69f0
parent 9fd8eb6fecb1d807809e2e58aa35a2f349ff9c2b

Roll external/skia 14b7375aa..9fd8eb6fe (2 commits)

https://skia.googlesource.com/skia.git/+log/14b7375aa..9fd8eb6fe

2018-02-21 update-docs@skia.org Update markdown files
2018-02-21 bungeman@google.com Add nativeFonts flag to Viewer.

The AutoRoll server is located here: https://android-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

Test: Presubmit checks will test this change.
Change-Id: Ibf06d865ccbfe936ef5a01d327340a3bacb85772
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.

Android.bp

diff --git a/Android.bp b/Android.bp
index 11275a6..15d2cd7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1038,6 +1038,7 @@
         "tools/",
         "tools/debugger/",
         "tools/flags/",
+        "tools/fonts/",
         "tools/gpu/",
         "tools/timer/",
         "tools/trace/",
@@ -1045,7 +1046,6 @@
 
     srcs: [
         "dm/DM.cpp",
-        "dm/DMFontMgr.cpp",
         "dm/DMGpuTestProcs.cpp",
         "dm/DMJsonWriter.cpp",
         "dm/DMSrcSink.cpp",
@@ -1760,8 +1760,6 @@
         "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",
@@ -1770,6 +1768,10 @@
         "tools/flags/SkCommandLineFlags.cpp",
         "tools/flags/SkCommonFlags.cpp",
         "tools/flags/SkCommonFlagsConfig.cpp",
+        "tools/fonts/SkRandomScalerContext.cpp",
+        "tools/fonts/SkTestFontMgr.cpp",
+        "tools/fonts/SkTestScalerContext.cpp",
+        "tools/fonts/sk_tool_utils_font.cpp",
         "tools/gpu/GrContextFactory.cpp",
         "tools/gpu/GrTest.cpp",
         "tools/gpu/TestContext.cpp",
@@ -1791,7 +1793,6 @@
         "tools/picture_utils.cpp",
         "tools/random_parse_path.cpp",
         "tools/sk_tool_utils.cpp",
-        "tools/sk_tool_utils_font.cpp",
         "tools/timer/Timer.cpp",
         "tools/trace/SkChromeTracingTracer.cpp",
         "tools/trace/SkDebugfTracer.cpp",
@@ -1860,6 +1861,7 @@
         "tools/",
         "tools/debugger/",
         "tools/flags/",
+        "tools/fonts/",
         "tools/gpu/",
         "tools/timer/",
         "tools/trace/",
@@ -2361,8 +2363,6 @@
         "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",
@@ -2371,6 +2371,10 @@
         "tools/flags/SkCommandLineFlags.cpp",
         "tools/flags/SkCommonFlags.cpp",
         "tools/flags/SkCommonFlagsConfig.cpp",
+        "tools/fonts/SkRandomScalerContext.cpp",
+        "tools/fonts/SkTestFontMgr.cpp",
+        "tools/fonts/SkTestScalerContext.cpp",
+        "tools/fonts/sk_tool_utils_font.cpp",
         "tools/gpu/GrContextFactory.cpp",
         "tools/gpu/GrTest.cpp",
         "tools/gpu/TestContext.cpp",
@@ -2392,7 +2396,6 @@
         "tools/picture_utils.cpp",
         "tools/random_parse_path.cpp",
         "tools/sk_tool_utils.cpp",
-        "tools/sk_tool_utils_font.cpp",
         "tools/timer/Timer.cpp",
         "tools/trace/SkChromeTracingTracer.cpp",
         "tools/trace/SkDebugfTracer.cpp",