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

Unified Diff: build/common.gypi

Issue 7904034: aura: Explicitly disable GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index f5b5bc1bf0d2cce1a4ce5692f097b7d4059e7b0b..ada70b2b9145bc18a628d2e9636b8cc9a0f0da6f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -231,15 +231,22 @@
# Flags to use Gtk and X11 on non-Mac POSIX platforms
['OS=="win" or OS=="mac"', {
+ 'toolkit_uses_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.
+ 'toolkit_uses_glib%': 1,
'toolkit_uses_gtk%': 1,
'use_x11%': 1,
}],
+ ['use_aura==1', {
+ 'toolkit_uses_glib%': 1,
+ 'toolkit_uses_gtk%': 0,
+ 'use_x11%': 1,
+ }],
# A flag to enable or disable our compile-time dependency
# on gnome-keyring. If that dependency is disabled, no gnome-keyring
@@ -297,6 +304,7 @@
'views_compositor%': '<(views_compositor)',
'use_aura%': '<(use_aura)',
'os_posix%': '<(os_posix)',
+ 'toolkit_uses_glib%': '<(toolkit_uses_glib)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_skia%': '<(use_skia)',
'use_x11%': '<(use_x11)',
« build/build_config.h ('K') | « build/build_config.h ('k') | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698