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

Unified Diff: build/common.gypi

Issue 7983022: Reland 102005 and 102009: 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
« no previous file with comments | « build/build_config.h ('k') | build/linux/system.gyp » ('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 d2666c4ccff3b0c84f2810aaa53ab9e9c7baf408..33763c125a2beb5f886c604785e06f136c8d8e93 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)',
« no previous file with comments | « build/build_config.h ('k') | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698