| Index: skia/BUILD.gn
|
| diff --git a/skia/BUILD.gn b/skia/BUILD.gn
|
| index 7fb49b8e40d703f3afe07474d7ecd8848b6169db..97f6d583e210875c22f2eb4c03d70822a41858d5 100644
|
| --- a/skia/BUILD.gn
|
| +++ b/skia/BUILD.gn
|
| @@ -112,6 +112,8 @@ config("skia_config") {
|
| "//third_party/skia/include/pipe",
|
| "//third_party/skia/include/ports",
|
| "//third_party/skia/include/utils",
|
| + # TODO(dsinclair): Right way to use //third_party/freetype?
|
| + "//third_party/freetype/include",
|
| ]
|
|
|
| defines = []
|
| @@ -241,7 +243,7 @@ config("skia_library_config") {
|
|
|
| component("skia") {
|
| sources = [
|
| - # Chrome sources.
|
| + # PDFium sources.
|
| "config/SkUserConfig.h",
|
| "ext/google_logging.cc",
|
| ]
|
| @@ -275,7 +277,6 @@ component("skia") {
|
| "//third_party/skia/src/utils/SkLayer.cpp",
|
| "//third_party/skia/src/utils/SkMeshUtils.cpp",
|
| "//third_party/skia/src/utils/SkNinePatch.cpp",
|
| - "//third_party/skia/src/utils/SkOSFile.cpp",
|
| "//third_party/skia/src/utils/SkParsePath.cpp",
|
|
|
| #testing
|
| @@ -342,15 +343,6 @@ component("skia") {
|
| ]
|
| }
|
|
|
| - # Add the files for the SkFontMgr_Android. This is used to emulate android
|
| - # fonts on linux. See content/zygote/zygote_main_linux.cc
|
| - if (is_linux) {
|
| - sources += [
|
| - "//third_party/skia/src/ports/SkFontMgr_android.cpp",
|
| - "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
|
| - ]
|
| - }
|
| -
|
| if (!is_linux && !is_android) {
|
| sources -= [
|
| "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
|
| @@ -379,14 +371,7 @@ component("skia") {
|
| ]
|
|
|
| if (is_linux) {
|
| - if (use_pango) {
|
| - configs += [ "//build/config/linux/pangocairo" ]
|
| - }
|
| deps += [
|
| - "//build/linux:fontconfig",
|
| - "//build/linux:freetype2",
|
| -
|
| - # "//third_party/expat",
|
| "//third_party/icu:icuuc",
|
| ]
|
| }
|
|
|