diff options
| -rw-r--r-- | skia/BUILD.gn | 12 | ||||
| -rw-r--r-- | skia/skia_gn_files.gypi | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 97f6d583e2..d83ca3acab 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -311,11 +311,14 @@ component("skia") { sources -= [ "//third_party/skia/src/ports/SkOSFile_posix.cpp", "//third_party/skia/src/ports/SkTLS_pthread.cpp", + "//third_party/skia/src/ports/SkFontMgr_custom.cpp", + "//third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp", ] } else { sources -= [ "//third_party/skia/src/ports/SkFontHost_win.cpp", "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp", + "//third_party/skia/src/ports/SkFontMgr_win_dw_factory.cpp", "//third_party/skia/src/ports/SkOSFile_win.cpp", "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp", "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp", @@ -334,15 +337,6 @@ component("skia") { sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] } - if (!is_linux) { - sources -= [ - "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", - "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", - "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp", - "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", - ] - } - if (!is_linux && !is_android) { sources -= [ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi index 7f7495996a..f54ac03ff5 100644 --- a/skia/skia_gn_files.gypi +++ b/skia/skia_gn_files.gypi @@ -15,6 +15,7 @@ '<(skia_src_path)/ports/SkFontMgr_android_factory.cpp', '<(skia_src_path)/ports/SkFontMgr_android_parser.cpp', '<(skia_src_path)/ports/SkFontMgr_win_dw.cpp', + '<(skia_src_path)/ports/SkFontMgr_win_dw_factory.cpp', '<(skia_src_path)/ports/SkGlobalInitialization_default.cpp', '<(skia_src_path)/ports/SkImageEncoder_none.cpp', '<(skia_src_path)/ports/SkOSFile_posix.cpp', |