diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 19:18:23 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 19:18:23 +0000 |
| commit | e01f942655774bae103f142542ab678eec5bfeb5 (patch) | |
| tree | 899bf20d8cff6de3b9c1b1483ec49a53ac1c0b31 /net/SConscript | |
| parent | 57902f6dbc700e527513aef871f06fd23d9f9f56 (diff) | |
| download | chromium_src-e01f942655774bae103f142542ab678eec5bfeb5.zip chromium_src-e01f942655774bae103f142542ab678eec5bfeb5.tar.gz chromium_src-e01f942655774bae103f142542ab678eec5bfeb5.tar.bz2 | |
Add net_util* to the SCons build. Fixes some ICU UChar issues in net_util. Also disable NetUtilTest.FileURLConversion because it seems to have Windows specific output (is this the right thing to do?).
The other changes to net_util_unittest is to get arraysize to work (see the comment in base/basictypes.h).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/SConscript')
| -rw-r--r-- | net/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/SConscript b/net/SConscript index fda79b2..c01a83c 100644 --- a/net/SConscript +++ b/net/SConscript @@ -68,6 +68,7 @@ input_files = [ 'base/mime_sniffer.cc', 'base/net_errors.cc', 'base/net_module.cc', + 'base/net_util.cc', 'disk_cache/backend_impl.cc', 'disk_cache/block_files.cc', 'disk_cache/entry_impl.cc', @@ -98,7 +99,6 @@ if env['PLATFORM'] == 'win32': 'base/host_resolver.cc', 'base/listen_socket.cc', 'base/mime_util.cc', - 'base/net_util.cc', 'base/platform_mime_util_win.cc', 'base/registry_controlled_domain.cc', 'base/ssl_client_socket.cc', @@ -186,8 +186,8 @@ env_tests.Prepend( 'base', 'googleurl', 'gtest', + 'net', # Likewise, net must come before modp_b64 and icuuc. 'icuuc', - 'net', # Likewise, net must come before modp_b64. 'modp_b64', 'zlib', ] @@ -232,6 +232,7 @@ unittest_files = [ 'base/data_url_unittest.cc', 'base/escape_unittest.cc', 'base/gzip_filter_unittest.cc', + 'base/net_util_unittest.cc', 'disk_cache/addr_unittest.cc', '$BASE_DIR/run_all_unittests$OBJSUFFIX', ] @@ -243,7 +244,6 @@ if env['PLATFORM'] == 'win32': 'base/directory_lister_unittest.cc', 'base/mime_sniffer_unittest.cc', 'base/mime_util_unittest.cc', - 'base/net_util_unittest.cc', 'base/registry_controlled_domain_unittest.cc', 'base/ssl_config_service_unittest.cc', 'base/ssl_client_socket_unittest.cc', |