summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 00:17:19 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 00:17:19 +0000
commit258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9 (patch)
treeae909a1785ad6845f22ec1703fe1cf27d9f41448 /base/base.gyp
parentbf1734063e3091984b53bb3baadcae42a976b0a6 (diff)
downloadchromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.zip
chromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.tar.gz
chromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.tar.bz2
Reland 102005 and 102009: aura: Explicitly disable GTK.
Explicitly disable GTK by setting TOOLKIT_USES_GTK. This is the first in a series of changes required to have chrome on aura build and link without GTK. This CL makes base/ build without GTK. Subsequent CLs will do this for other components. TBR=evan@chromium.org BUG=97131 TEST=none Review URL: http://codereview.chromium.org/7983022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp19
1 files changed, 12 insertions, 7 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 8bca61bee..a4755e3 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',
]