diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 00:17:19 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 00:17:19 +0000 |
| commit | 258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9 (patch) | |
| tree | ae909a1785ad6845f22ec1703fe1cf27d9f41448 /build/common.gypi | |
| parent | bf1734063e3091984b53bb3baadcae42a976b0a6 (diff) | |
| download | chromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.zip chromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.tar.gz chromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.tar.bz2 | |
Reland 102005 and 102009: aura: Explicitly disable GTK.
Explicitly disable GTK by setting TOOLKIT_USES_GTK. This is the first in a
series of changes required to have chrome on aura build and link without GTK.
This CL makes base/ build without GTK. Subsequent CLs will do this for other
components.
TBR=evan@chromium.org
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/7983022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index d2666c4..33763c1 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -235,18 +235,21 @@ 'os_posix%': 1, }], - # Flag to use X11 on non-Mac POSIX platforms + # Flags to use X11 on non-Mac POSIX platforms ['OS=="win" or OS=="mac" or OS=="android"', { + 'use_glib%': 0, + 'toolkit_uses_gtk%': 0, 'use_x11%': 0, }, { + # TODO(dnicoara) Wayland build should have these disabled, but + # currently GTK and X is too spread and it's hard to completely + # remove every dependency. + 'use_glib%': 1, + 'toolkit_uses_gtk%': 1, 'use_x11%': 1, }], - - # Flag to use Gtk on non-Aura and non-Mac POSIX platforms - ['OS=="win" or OS=="mac" or OS=="android" or use_aura==1', { + ['use_aura==1 and OS!="win"', { 'toolkit_uses_gtk%': 0, - }, { - 'toolkit_uses_gtk%': 1, }], # A flag to enable or disable our compile-time dependency @@ -310,6 +313,7 @@ 'views_compositor%': '<(views_compositor)', 'use_aura%': '<(use_aura)', 'os_posix%': '<(os_posix)', + 'use_glib%': '<(use_glib)', 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 'use_skia%': '<(use_skia)', 'use_x11%': '<(use_x11)', |