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

Unified Diff: base/base.gyp

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
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 8bca61beef2fa1c2ebdd7d6fdca2e5432b9fea84..a4755e3b0743cc48ec37203c065bcaab37a362e3 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -144,7 +144,7 @@
'i18n/icu_string_conversions_unittest.cc',
'i18n/number_formatting_unittest.cc',
'i18n/rtl_unittest.cc',
- 'i18n/string_search_unittest.cc',
+ 'i18n/string_search_unittest.cc',
'i18n/time_formatting_unittest.cc',
'json/json_reader_unittest.cc',
'json/json_writer_unittest.cc',
@@ -257,13 +257,10 @@
'module_dir': 'base'
},
'conditions': [
- ['toolkit_uses_gtk==1', {
+ ['use_glib==1', {
'sources!': [
'file_version_info_unittest.cc',
],
- 'sources': [
- 'nix/xdg_util_unittest.cc',
- ],
'conditions': [
[ 'linux_use_tcmalloc==1', {
'dependencies': [
@@ -278,13 +275,21 @@
'-fno-strict-aliasing',
],
}],
+ [ 'toolkit_uses_gtk==1', {
+ 'sources': [
+ 'nix/xdg_util_unittest.cc',
+ ],
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ]
+ }],
],
'dependencies': [
- '../build/linux/system.gyp:gtk',
+ '../build/linux/system.gyp:glib',
'../build/linux/system.gyp:ssl',
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
- }, { # toolkit_uses_gtk!=1
+ }, { # use_glib!=1
'sources!': [
'message_pump_glib_unittest.cc',
]
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698