提交 8688206e 编写于 作者: J Jason Simmons 提交者: GitHub

Revert to using SkFontMgr_FontConfigInterface after the latest Skia roll (#2994)

In older versions of Skia, there were two files named SkFontMgr_fontconfig.cpp.
We want to use the one that contains SkFontMgr_FCI.  That file was renamed
to SkFontMgr_FontConfigInterface.cpp

This caused the assert in https://github.com/flutter/flutter/issues/5694
上级 54706afb
......@@ -288,8 +288,8 @@ component("skia") {
"//third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
"//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
"//third_party/skia/src/ports/SkFontMgr_android.cpp",
"//third_party/skia/src/ports/SkFontMgr_fontconfig.cpp",
"//third_party/skia/src/ports/SkFontMgr_fontconfig_factory.cpp",
"//third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp",
"//third_party/skia/src/ports/SkFontMgr_FontConfigInterface_factory.cpp",
"//third_party/skia/src/ports/SkFontMgr_win_dw.cpp",
"//third_party/skia/src/ports/SkGlobalInitialization_default.cpp",
"//third_party/skia/src/ports/SkImageEncoder_none.cpp",
......@@ -437,8 +437,8 @@ component("skia") {
sources -= [
"//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
"//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
"//third_party/skia/src/ports/SkFontMgr_fontconfig.cpp",
"//third_party/skia/src/ports/SkFontMgr_fontconfig_factory.cpp",
"//third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp",
"//third_party/skia/src/ports/SkFontMgr_FontConfigInterface_factory.cpp",
]
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册