summaryrefslogtreecommitdiffstats
path: root/skia/BUILD.gn
diff options
context:
space:
mode:
authorbungeman@google.com <bungeman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-14 14:04:34 +0000
committerbungeman@google.com <bungeman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-14 14:06:33 +0000
commit2dc1e108728932bfd5073dd18b0d3d48e595739f (patch)
treefcd8c14f04f2f93a4a0edf050add8d8f92956f6d /skia/BUILD.gn
parentd8be320fb2221d071fef3064788d63133b069ec5 (diff)
downloadchromium_src-2dc1e108728932bfd5073dd18b0d3d48e595739f.zip
chromium_src-2dc1e108728932bfd5073dd18b0d3d48e595739f.tar.gz
chromium_src-2dc1e108728932bfd5073dd18b0d3d48e595739f.tar.bz2
Skia roll fbd3576:c773390
https://skia.googlesource.com/skia/+log/fbd3576a18799da88988ef26fa9bce09e8ebba37..c773390eefe70d13faab147a70bd9319b9ac3afb CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_layout_rel TBR=bsalomon@google.com BUG= Review URL: https://codereview.chromium.org/467363002 Cr-Commit-Position: refs/heads/master@{#289548} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/BUILD.gn')
-rw-r--r--skia/BUILD.gn3
1 files changed, 1 insertions, 2 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index f64b22d..ab06891 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",
]