diff options
| author | slan <slan@chromium.org> | 2015-09-24 17:04:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-25 00:05:41 +0000 |
| commit | 17e5ce7ff587612814565e8fa2d737e76feb3e56 (patch) | |
| tree | b1b66cc67eaee9cc430baaa8fd3c37b8e045b716 /skia | |
| parent | fb42393e2daee38cdba3978ae5668b90569a674b (diff) | |
| download | chromium_src-17e5ce7ff587612814565e8fa2d737e76feb3e56.zip chromium_src-17e5ce7ff587612814565e8fa2d737e76feb3e56.tar.gz chromium_src-17e5ce7ff587612814565e8fa2d737e76feb3e56.tar.bz2 | |
[Chromecast] Replace 'fontconfig' GN target with dynamic dependency.
Chromecast needs to be able to optionally use //third_party/fontconfig
instead of system headers. This CL acheives parity with the GYP build
for this feature:
https://code.google.com/p/chromium/codesearch#chromium/src/build/linux/system.gyp&l=748
BUG=516899
Review URL: https://codereview.chromium.org/1366653003
Cr-Commit-Position: refs/heads/master@{#350711}
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 6e00377..443d72f 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -462,14 +462,15 @@ component("skia") { ] if (is_linux) { - configs += [ - "//build/config/linux:fontconfig", - "//build/config/linux:freetype2", - ] + configs += [ "//build/config/linux:freetype2" ] + if (use_pango) { configs += [ "//build/config/linux:pangocairo" ] } - deps += [ "//third_party/icu:icuuc" ] + deps += [ + "//build/linux:fontconfig", + "//third_party/icu:icuuc", + ] } if (is_android) { |