commit 19ea309f3d46bbd76d4201b4e791b11d736f7834
author thestig <thestig@chromium.org> Fri May 13 11:24:26 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri May 13 11:24:26 2016 -0700
tree 56f6d4f028554ceb0b76b075cab512a1b973d8ae
parent 9c845c3117bf09191e83e9108e98a82fb1051075

Make the Skia GN build work.

On Linux, at least.

BUG=pdfium:11

Review-Url: https://codereview.chromium.org/1971023007

skia/BUILD.gn

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 7fb49b8..97f6d58 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -112,6 +112,8 @@
     "//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 @@
 
 component("skia") {
   sources = [
-    # Chrome sources.
+    # PDFium sources.
     "config/SkUserConfig.h",
     "ext/google_logging.cc",
   ]
@@ -275,7 +277,6 @@
     "//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 @@
     ]
   }
 
-  # 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 @@
   ]
 
   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",
     ]
   }