summaryrefslogtreecommitdiffstats
path: root/net/SConscript
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 18:46:26 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 18:46:26 +0000
commit36987e9fae95a51a980b4f0d71ca2df1a630407e (patch)
tree8d77b940020eb84b1926b41c8e5cec964299038c /net/SConscript
parent5a22409d7b625fa1f2a03194ff6c011f82f150dc (diff)
downloadchromium_src-36987e9fae95a51a980b4f0d71ca2df1a630407e.zip
chromium_src-36987e9fae95a51a980b4f0d71ca2df1a630407e.tar.gz
chromium_src-36987e9fae95a51a980b4f0d71ca2df1a630407e.tar.bz2
Use libevent, second try. Changes this time:
- remove bogus include of base/completion_callback.h - add DEPS rules to allow including third_party/libevent Review URL: http://codereview.chromium.org/2964 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/SConscript')
-rw-r--r--net/SConscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/SConscript b/net/SConscript
index fe95094..4bd5ef7 100644
--- a/net/SConscript
+++ b/net/SConscript
@@ -133,6 +133,7 @@ if env['PLATFORM'] == 'posix':
input_files.extend([
# TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
'base/platform_mime_util_linux.cc',
+ 'base/tcp_client_socket_libevent.cc',
])
if env['PLATFORM'] in ('darwin', 'posix'):
@@ -169,6 +170,7 @@ env_tests.Prepend(
'net', # net must come before base and modp_b64
'bzip2', # bzip2 must come before base
'base',
+ 'event',
'googleurl',
'gtest',
'icuuc',
@@ -224,6 +226,7 @@ unittest_files = [
'base/net_util_unittest.cc',
'base/registry_controlled_domain_unittest.cc',
'base/run_all_unittests.cc',
+ 'base/tcp_client_socket_unittest.cc',
'base/test_completion_callback_unittest.cc',
'disk_cache/addr_unittest.cc',
'disk_cache/block_files_unittest.cc',
@@ -242,7 +245,6 @@ if env['PLATFORM'] == 'win32':
'base/directory_lister_unittest.cc',
'base/ssl_config_service_unittest.cc',
'base/ssl_client_socket_unittest.cc',
- 'base/tcp_client_socket_unittest.cc',
'base/wininet_util_unittest.cc',
'disk_cache/backend_unittest.cc',
'http/http_cache_unittest.cc',