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

Unified Diff: build/common.gypi

Issue 7978007: Revert 102005 - 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
===================================================================
--- build/common.gypi (revision 102014)
+++ build/common.gypi (working copy)
@@ -234,22 +234,15 @@
# Flags to use Gtk and 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,
}],
- ['use_aura==1', {
- 'use_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
@@ -312,7 +305,6 @@
'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