Skia roll f73c237291b:8d84c995319

Try Chromium build with SkFontMgr_android.

CQ_EXTRA_TRYBOTS=tryserver.chromium:linux_layout_rel
TBR=robertphillips@google.com
NOTRY=true

Review URL: https://codereview.chromium.org/413743003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285340 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -46,7 +46,7 @@ vars = {
   "lss_revision": "26",
   "sfntly_revision": "239",
   "lighttpd_revision": "33737",
-  "skia_revision": "f73c237291bb1fc698f688d8a9b1cdd23838ed18",
+  "skia_revision": "8d84c995319dd4a82e4f2054bbd19f968c671ca6",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.

skia/BUILD.gn

@@ -438,6 +438,7 @@ component("skia") {
     sources -= [
       "//third_party/skia/src/ports/SkFontConfigInterface_android.cpp",
       "//third_party/skia/src/ports/SkFontConfigParser_android.cpp",
+      "//third_party/skia/src/ports/SkFontMgr_android.cpp",
     ]
   }
   if (!is_mac) {

skia/skia_gn_files.gypi

@@ -22,6 +22,7 @@
     '<(skia_src_path)/ports/SkFontHost_FreeType.cpp',
     '<(skia_src_path)/ports/SkFontHost_mac.cpp',
     '<(skia_src_path)/ports/SkFontHost_win.cpp',
+    '<(skia_src_path)/ports/SkFontMgr_android.cpp',
     '<(skia_src_path)/ports/SkFontMgr_win_dw.cpp',
     '<(skia_src_path)/ports/SkGlobalInitialization_chromium.cpp',
     '<(skia_src_path)/ports/SkImageDecoder_empty.cpp',

skia/skia_library.gypi

@@ -52,6 +52,7 @@
     '../third_party/skia/src/ports/SkFontConfigParser_android.cpp',
     '../third_party/skia/src/ports/SkFontHost_mac.cpp',
     '../third_party/skia/src/ports/SkFontHost_win.cpp',
+    "../third_party/skia/src/ports/SkFontMgr_android.cpp",
     '../third_party/skia/src/ports/SkFontMgr_win_dw.cpp',
     '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp',
     '../third_party/skia/src/ports/SkOSFile_posix.cpp',