diff --git a/DEPS b/DEPS index 50a84e824f34..b83e08457519 100644 --- a/DEPS +++ b/DEPS @@ -46,7 +46,7 @@ vars = { "lss_revision": "31", "sfntly_revision": "239", "lighttpd_revision": "33737", - "skia_revision": "fbd3576a18799da88988ef26fa9bce09e8ebba37", + "skia_revision": "c773390eefe70d13faab147a70bd9319b9ac3afb", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. diff --git a/skia/BUILD.gn b/skia/BUILD.gn index f64b22d06839..ab06891b66ca 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -444,7 +444,6 @@ component("skia") { } if (!is_android) { 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", ] @@ -457,6 +456,7 @@ component("skia") { if (!is_linux) { sources -= [ + "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", ] @@ -464,7 +464,6 @@ component("skia") { if (!is_linux && !is_android) { sources -= [ - "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", ] diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi index c7f8ae374091..17914b281a4c 100644 --- a/skia/skia_gn_files.gypi +++ b/skia/skia_gn_files.gypi @@ -13,7 +13,6 @@ '<(skia_src_path)/fonts/SkRemotableFontMgr.cpp', '<(skia_src_path)/images/SkScaledBitmapSampler.cpp', '<(skia_src_path)/images/SkScaledBitmapSampler.h', - '<(skia_src_path)/ports/SkFontConfigInterface_android.cpp', '<(skia_src_path)/ports/SkFontConfigInterface_direct.cpp', '<(skia_src_path)/ports/SkFontConfigParser_android.cpp', '<(skia_src_path)/ports/SkFontHost_fontconfig.cpp', diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index f8f855f9602b..aed4f6116d1a 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -35,7 +35,6 @@ '../third_party/skia/src/opts/opts_check_x86.cpp', - '../third_party/skia/src/ports/SkFontConfigInterface_android.cpp', '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp', '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp', @@ -256,6 +255,7 @@ [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { 'sources!': [ '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp', + '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp', '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp', ], }], @@ -263,7 +263,6 @@ 'sources!': [ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', - '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp', ], }],