Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(557)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: skia/skia_library.gypi

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« shell/BUILD.gn ('K') | « skia/ext/vector_canvas_unittest.cc ('k') | skia/skia_test_expectations.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia_library.gypi
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index 67281ec1f55eb404605fb3f73eb2754bfe948dbe..36bdee65ba1df3b47a63b5b663d2bdbe0466513b 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -244,6 +244,11 @@
'-Wno-unused-function',
],
}],
+ [ 'use_cairo == 1 and use_pango == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:pangocairo',
+ ],
+ }],
[ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
'sources!': [
'../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
« shell/BUILD.gn ('K') | « skia/ext/vector_canvas_unittest.cc ('k') | skia/skia_test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698