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

Unified Diff: build/common.gypi

Issue 15102010: untangle pango usage from use_x11 and OS==linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove stray unit test inclusion (bad rebase?) Created 7 years, 7 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
« no previous file with comments | « no previous file | content/common/font_list_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 2a01a66b66fc96f056ed3a7c4c6036fbbde1636a..6eaf0c8088dd64a337fb572ca7ec848a11a42d1a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -445,11 +445,13 @@
'use_x11%': 1,
}],
- # Flags to use glib on non-Mac POSIX platforms.
+ # Flags to use pango and glib on non-Mac POSIX platforms.
['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
'use_glib%': 0,
+ 'use_pango%': 0,
}, {
'use_glib%': 1,
+ 'use_pango%': 1,
}],
# We always use skia text rendering in Aura on Windows, since GDI
@@ -735,6 +737,7 @@
'os_bsd%': '<(os_bsd)',
'os_posix%': '<(os_posix)',
'use_glib%': '<(use_glib)',
+ 'use_pango%': '<(use_pango)',
'use_ozone%': '<(use_ozone)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_x11%': '<(use_x11)',
« no previous file with comments | « no previous file | content/common/font_list_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698