diff options
| author | bungeman@google.com <bungeman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 14:04:34 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 14:06:33 +0000 |
| commit | 2dc1e108728932bfd5073dd18b0d3d48e595739f (patch) | |
| tree | fcd8c14f04f2f93a4a0edf050add8d8f92956f6d /skia/skia_library.gypi | |
| parent | d8be320fb2221d071fef3064788d63133b069ec5 (diff) | |
| download | chromium_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/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index f8f855f..aed4f611 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', ], }], |