diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 03:12:07 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 03:12:07 +0000 |
| commit | 062f9313a12226109e13bb88440cf4bf0af79133 (patch) | |
| tree | 999f3f2fc8c4f4e3ddd0c82bd4ec9da642a34f2a /net/net.gyp | |
| parent | 4f0806a7579f157ab18ba6fc523182bea5850aac (diff) | |
| download | chromium_src-062f9313a12226109e13bb88440cf4bf0af79133.zip chromium_src-062f9313a12226109e13bb88440cf4bf0af79133.tar.gz chromium_src-062f9313a12226109e13bb88440cf4bf0af79133.tar.bz2 | |
aura: Make 'net' buildable with gtk disabled.
Depends on http://codereview.chromium.org/7904034/
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/7944011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/net/net.gyp b/net/net.gyp index 1b752b7..b4ce67a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -790,10 +790,9 @@ ], }, ], - [ 'toolkit_uses_gtk == 1', { + [ 'use_glib == 1', { 'dependencies': [ '../build/linux/system.gyp:gconf', - '../build/linux/system.gyp:gdk', '../build/linux/system.gyp:gio', '../build/linux/system.gyp:libresolv', ], @@ -837,6 +836,11 @@ ], }, ], + [ 'toolkit_uses_gtk == 1', { + 'dependencies': [ + '../build/linux/system.gyp:gdk', + ], + }], [ 'OS == "win"', { 'sources!': [ 'http/http_auth_handler_ntlm_portable.cc', @@ -1095,17 +1099,21 @@ 'proxy/proxy_config_service_linux_unittest.cc', ], }], - [ 'toolkit_uses_gtk == 1', { + [ 'use_glib == 1', { 'dependencies': [ - '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:ssl', ], - }, - { # else: OS is not in the above list + }, { # else: OS is not in the above list 'sources!': [ 'base/cert_database_nss_unittest.cc', ], - } + }, + ], + [ 'toolkit_uses_gtk == 1', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }, ], [ 'os_posix == 1 and OS != "mac"', { 'conditions': [ |