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

Unified Diff: skia/skia_library.gypi

Issue 59133008: ozone: Support building without cairo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & fix whitespace Created 7 years, 1 month 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
« no previous file with comments | « skia/skia_common.gypi ('k') | ui/gfx/blit.cc » ('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 a93f6d5529ecc367b702339110f42829401cf032..9d7dacdaedc9d8b4a87457a1e7da3b9840671f52 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -273,7 +273,6 @@
'dependencies': [
'../build/linux/system.gyp:fontconfig',
'../build/linux/system.gyp:freetype2',
- '../build/linux/system.gyp:pangocairo',
'../third_party/icu/icu.gyp:icuuc',
],
'cflags': [
@@ -281,6 +280,11 @@
'-Wno-unused-function',
],
}],
+ [ 'use_cairo == 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',
« no previous file with comments | « skia/skia_common.gypi ('k') | ui/gfx/blit.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698