diff options
| author | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 21:44:15 +0000 |
|---|---|---|
| committer | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 21:44:15 +0000 |
| commit | 26bade8981809d3a7ddf2e82062553b379cf61f7 (patch) | |
| tree | de33a26d4ca269ff538ba05addc0b4ffc450e734 /build | |
| parent | 1bc163f076cca7831aa72e27f40787daf3ce1a41 (diff) | |
| download | chromium_src-26bade8981809d3a7ddf2e82062553b379cf61f7.zip chromium_src-26bade8981809d3a7ddf2e82062553b379cf61f7.tar.gz chromium_src-26bade8981809d3a7ddf2e82062553b379cf61f7.tar.bz2 | |
untangle pango usage from use_x11 and OS==linux
This allows pango to be toggled independently of X11 and linux. It defaults
to enabled on these.
Review URL: https://chromiumcodereview.appspot.com/15102010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index c4bb76b..130ae7d 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)', |