Making TOOLKIT_USES_GTK orthogonal to USE_AURA.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7973003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102019 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index f46ba16..d2666c4 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -235,18 +235,20 @@
'os_posix%': 1,
}],
- # Flags to use Gtk and X11 on non-Mac POSIX platforms
+ # Flag to use X11 on non-Mac POSIX platforms
['OS=="win" or OS=="mac" or OS=="android"', {
- '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.
- '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', {
+ 'toolkit_uses_gtk%': 0,
+ }, {
+ 'toolkit_uses_gtk%': 1,
+ }],
+
# A flag to enable or disable our compile-time dependency
# on gnome-keyring. If that dependency is disabled, no gnome-keyring
# support will be available. This option is useful
