diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 19:22:18 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 19:22:18 +0000 |
| commit | 88dc46191ae7a0c1ada763843d3465d735c6b271 (patch) | |
| tree | dab30b352514c5ab4161402b6939c95db2b80bd2 | |
| parent | 4b67a25df0f0d8e6a34e13e114a42b2f91d9d0f5 (diff) | |
| download | chromium_src-88dc46191ae7a0c1ada763843d3465d735c6b271.zip chromium_src-88dc46191ae7a0c1ada763843d3465d735c6b271.tar.gz chromium_src-88dc46191ae7a0c1ada763843d3465d735c6b271.tar.bz2 | |
Add libevent to the Mac SCons build of net_unittests:
* Build base/tcp_client_socket_libevent.cc on both Linux and Mac.
* Link against -levent on both Linux and Mac.
* Don't build base/cookie_policy_unittest.cc on Mac (yet?); it throws
warnings (and is currently not being built by XCode, either).
Review URL: http://codereview.chromium.org/4257
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2561 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/SConscript | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/SConscript b/net/SConscript index 0473ac3..3d4e1c0 100644 --- a/net/SConscript +++ b/net/SConscript @@ -24,7 +24,6 @@ env.Append( ], ) - # These net files work on *all* platforms; files that don't work # cross-platform live below. input_files = [ @@ -132,12 +131,12 @@ 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'): input_files.extend([ 'base/net_util_posix.cc', + 'base/tcp_client_socket_libevent.cc', 'disk_cache/cache_util_posix.cc', 'disk_cache/file_posix.cc', 'disk_cache/mapped_file_posix.cc', @@ -209,7 +208,7 @@ if env['PLATFORM'] == 'win32': ], ) -if env['PLATFORM'] == 'posix': +if env['PLATFORM'] in ('posix', 'darwin'): env_tests.Append( LIBS = [ 'event', @@ -223,7 +222,6 @@ unittest_files = [ 'base/bzip2_filter_unittest.cc', 'base/client_socket_pool_unittest.cc', 'base/cookie_monster_unittest.cc', - 'base/cookie_policy_unittest.cc', 'base/data_url_unittest.cc', 'base/escape_unittest.cc', 'base/gzip_filter_unittest.cc', @@ -250,6 +248,7 @@ unittest_files = [ if env['PLATFORM'] == 'win32': unittest_files.extend([ + 'base/cookie_policy_unittest.cc', 'base/directory_lister_unittest.cc', 'base/sdch_filter_unitest.cc', 'base/ssl_config_service_unittest.cc', @@ -265,6 +264,11 @@ if env['PLATFORM'] == 'win32': 'url_request/url_request_unittest.cc', ]) +if env['PLATFORM'] == 'posix': + unittest_files.extend([ + 'base/cookie_policy_unittest.cc', + ]) + if env['PLATFORM'] == 'darwin': unittest_files.extend([ '../base/platform_test_mac.o', |