diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-08 21:45:05 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-08 21:45:05 +0000 |
| commit | 085cb5aea070d21835b750a0164b4cce0fcb12c7 (patch) | |
| tree | 6a67a615602d93b622443fabcdcbc6f94a5475ff /net/SConscript | |
| parent | 2314403e94e659d586475e59975e9d84d87cbcd3 (diff) | |
| download | chromium_src-085cb5aea070d21835b750a0164b4cce0fcb12c7.zip chromium_src-085cb5aea070d21835b750a0164b4cce0fcb12c7.tar.gz chromium_src-085cb5aea070d21835b750a0164b4cce0fcb12c7.tar.bz2 | |
Get MIME stuff working minimally to the point where we have
unit tests passing.
B=1315
Review URL: http://codereview.chromium.org/1824
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/SConscript')
| -rw-r--r-- | net/SConscript | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/SConscript b/net/SConscript index 519d5ea..7b5c187 100644 --- a/net/SConscript +++ b/net/SConscript @@ -43,6 +43,7 @@ input_files = [ 'base/gzip_header.cc', 'base/host_resolver.cc', 'base/mime_sniffer.cc', + 'base/mime_util.cc', 'base/net_errors.cc', 'base/net_module.cc', 'base/net_util.cc', @@ -84,7 +85,6 @@ if env['PLATFORM'] == 'win32': 'base/directory_lister.cc', 'base/dns_resolution_observer.cc', 'base/listen_socket.cc', - 'base/mime_util.cc', 'base/ssl_client_socket.cc', 'base/ssl_config_service.cc', 'base/tcp_client_socket.cc', @@ -128,11 +128,15 @@ if env['PLATFORM'] == 'darwin': 'base/platform_mime_util_mac.cc', ]) +if env['PLATFORM'] == 'posix': + input_files.extend([ + # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? + 'base/platform_mime_util_linux.cc', + ]) + if env['PLATFORM'] in ('darwin', 'posix'): input_files.extend([ 'base/net_util_posix.cc', - # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? - #'base/platform_mime_util_linux.cc, 'disk_cache/cache_util_posix.cc', 'disk_cache/file_posix.cc', 'disk_cache/mapped_file_posix.cc', @@ -214,6 +218,7 @@ unittest_files = [ 'base/gzip_filter_unittest.cc', 'base/host_resolver_unittest.cc', 'base/mime_sniffer_unittest.cc', + 'base/mime_util_unittest.cc', 'base/net_util_unittest.cc', 'base/registry_controlled_domain_unittest.cc', 'base/run_all_unittests.cc', @@ -233,7 +238,6 @@ if env['PLATFORM'] == 'win32': unittest_files.extend([ 'base/cookie_policy_unittest.cc', 'base/directory_lister_unittest.cc', - 'base/mime_util_unittest.cc', 'base/ssl_config_service_unittest.cc', 'base/ssl_client_socket_unittest.cc', 'base/tcp_client_socket_unittest.cc', @@ -325,4 +329,3 @@ if env['PLATFORM'] == 'win32': else: icudata = '../icudt38l.dat' env.Alias('net', ['.', installed_tests, icudata]) - |