diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:29:52 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:29:52 +0000 |
| commit | 9cabbaf78c3a3bbcb52c0ae6fbb06afd98224bf1 (patch) | |
| tree | af8219e1a0d1be12649eb4b19f32025419d762f3 /base/base.gyp | |
| parent | 177623b42c69743828b8bd0a40c0f07b072ba86d (diff) | |
| download | chromium_src-9cabbaf78c3a3bbcb52c0ae6fbb06afd98224bf1.zip chromium_src-9cabbaf78c3a3bbcb52c0ae6fbb06afd98224bf1.tar.gz chromium_src-9cabbaf78c3a3bbcb52c0ae6fbb06afd98224bf1.tar.bz2 | |
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.
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/7904034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 19 |
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', ] |