diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:56:51 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:56:51 +0000 |
| commit | 8d415017601515d178cdae3a26704196072fa4b5 (patch) | |
| tree | 40fdd11e2d8ca302b6890553be54f71eb23b5c82 /base/base.gyp | |
| parent | 8e50de7369c44f135a94e779f7b9ff3857a04243 (diff) | |
| download | chromium_src-8d415017601515d178cdae3a26704196072fa4b5.zip chromium_src-8d415017601515d178cdae3a26704196072fa4b5.tar.gz chromium_src-8d415017601515d178cdae3a26704196072fa4b5.tar.bz2 | |
Revert 102005 - 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
TBR=sadrul@chromium.org
Review URL: http://codereview.chromium.org/7978007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/base/base.gyp b/base/base.gyp index a4755e3..8bca61bee 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,10 +257,13 @@ 'module_dir': 'base' }, 'conditions': [ - ['use_glib==1', { + ['toolkit_uses_gtk==1', { 'sources!': [ 'file_version_info_unittest.cc', ], + 'sources': [ + 'nix/xdg_util_unittest.cc', + ], 'conditions': [ [ 'linux_use_tcmalloc==1', { 'dependencies': [ @@ -275,21 +278,13 @@ '-fno-strict-aliasing', ], }], - [ 'toolkit_uses_gtk==1', { - 'sources': [ - 'nix/xdg_util_unittest.cc', - ], - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ] - }], ], 'dependencies': [ - '../build/linux/system.gyp:glib', + '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:ssl', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], - }, { # use_glib!=1 + }, { # toolkit_uses_gtk!=1 'sources!': [ 'message_pump_glib_unittest.cc', ] |