diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-07 14:18:56 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:13 +0000 |
| commit | 201ade2fbba22bfb27ae029f4d23fca6ded109a0 (patch) | |
| tree | b793f4ed916f73cf18357ea467ff3deb5ffb5b52 /net/net.gyp | |
| parent | d8c4c37a7d0961944bfdfaa117d5c68c8e129c97 (diff) | |
| download | external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.zip external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.gz external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.bz2 | |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 119 |
1 files changed, 62 insertions, 57 deletions
diff --git a/net/net.gyp b/net/net.gyp index b9e3776..a5134da 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -582,8 +582,8 @@ 'socket/client_socket_pool_histograms.h', 'socket/client_socket_pool_manager.cc', 'socket/client_socket_pool_manager.h', - 'socket/dns_cert_provenance_check.cc', - 'socket/dns_cert_provenance_check.h', + 'socket/dns_cert_provenance_checker.cc', + 'socket/dns_cert_provenance_checker.h', 'socket/socket.h', 'socket/socks5_client_socket.cc', 'socket/socks5_client_socket.h', @@ -685,6 +685,14 @@ 'url_request/url_request_status.h', 'url_request/url_request_test_job.cc', 'url_request/url_request_test_job.h', + 'url_request/url_request_throttler_entry.cc', + 'url_request/url_request_throttler_entry.h', + 'url_request/url_request_throttler_entry_interface.h', + 'url_request/url_request_throttler_header_adapter.h', + 'url_request/url_request_throttler_header_adapter.cc', + 'url_request/url_request_throttler_header_interface.h', + 'url_request/url_request_throttler_manager.cc', + 'url_request/url_request_throttler_manager.h', 'url_request/view_cache_helper.cc', 'url_request/view_cache_helper.h', 'websockets/websocket.cc', @@ -862,7 +870,7 @@ 'base/test_completion_callback_unittest.cc', 'base/upload_data_stream_unittest.cc', 'base/x509_certificate_unittest.cc', - 'base/x509_cert_types_unittest.cc', + 'base/x509_cert_types_mac_unittest.cc', 'base/x509_openssl_util_unittest.cc', 'disk_cache/addr_unittest.cc', 'disk_cache/backend_unittest.cc', @@ -960,6 +968,7 @@ 'tools/dump_cache/url_utilities.cc', 'tools/dump_cache/url_utilities_unittest.cc', 'url_request/url_request_job_tracker_unittest.cc', + 'url_request/url_request_throttler_unittest.cc', 'url_request/url_request_unittest.cc', 'url_request/url_request_unittest.h', 'url_request/view_cache_helper_unittest.cc', @@ -1334,61 +1343,57 @@ }, ], 'conditions': [ - # ['OS=="linux"', { - # 'targets': [ - # { - # 'target_name': 'flip_in_mem_edsm_server', - # 'type': 'executable', - # 'dependencies': [ - # '../base/base.gyp:base', - # 'net.gyp:net', - # ], - # 'link_settings': { - # 'ldflags': [ - # '-lssl' - # ], - # 'libraries': [ - # '-lssl' - # ], - # }, - # 'sources': [ - # 'tools/dump_cache/url_to_filename_encoder.cc', - # 'tools/dump_cache/url_to_filename_encoder.h', - # 'tools/dump_cache/url_utilities.h', - # 'tools/dump_cache/url_utilities.cc', + ['OS=="linux"', { + 'targets': [ + { + 'target_name': 'flip_in_mem_edsm_server', + 'type': 'executable', + 'cflags': [ + '-Wno-deprecated', + ], + 'dependencies': [ + '../base/base.gyp:base', + 'net.gyp:net', + '../third_party/openssl/openssl.gyp:openssl', + ], + 'sources': [ + 'tools/dump_cache/url_to_filename_encoder.cc', + 'tools/dump_cache/url_to_filename_encoder.h', + 'tools/dump_cache/url_utilities.h', + 'tools/dump_cache/url_utilities.cc', - # 'tools/flip_server/balsa_enums.h', - # 'tools/flip_server/balsa_frame.cc', - # 'tools/flip_server/balsa_frame.h', - # 'tools/flip_server/balsa_headers.cc', - # 'tools/flip_server/balsa_headers.h', - # 'tools/flip_server/balsa_headers_token_utils.cc', - # 'tools/flip_server/balsa_headers_token_utils.h', - # 'tools/flip_server/balsa_visitor_interface.h', - # 'tools/flip_server/buffer_interface.h', - # 'tools/flip_server/create_listener.cc', - # 'tools/flip_server/create_listener.h', - # 'tools/flip_server/epoll_server.cc', - # 'tools/flip_server/epoll_server.h', - # 'tools/flip_server/flip_in_mem_edsm_server.cc', - # 'tools/flip_server/http_message_constants.cc', - # 'tools/flip_server/http_message_constants.h', - # 'tools/flip_server/loadtime_measurement.h', - # 'tools/flip_server/porting.txt', - # 'tools/flip_server/ring_buffer.cc', - # 'tools/flip_server/ring_buffer.h', - # 'tools/flip_server/simple_buffer.cc', - # 'tools/flip_server/simple_buffer.h', - # 'tools/flip_server/split.h', - # 'tools/flip_server/split.cc', - # 'tools/flip_server/string_piece_utils.h', - # 'tools/flip_server/thread.h', - # 'tools/flip_server/url_to_filename_encoder.h', - # 'tools/flip_server/url_utilities.h', - # ], - # }, - # ] - # }], + 'tools/flip_server/balsa_enums.h', + 'tools/flip_server/balsa_frame.cc', + 'tools/flip_server/balsa_frame.h', + 'tools/flip_server/balsa_headers.cc', + 'tools/flip_server/balsa_headers.h', + 'tools/flip_server/balsa_headers_token_utils.cc', + 'tools/flip_server/balsa_headers_token_utils.h', + 'tools/flip_server/balsa_visitor_interface.h', + 'tools/flip_server/buffer_interface.h', + 'tools/flip_server/create_listener.cc', + 'tools/flip_server/create_listener.h', + 'tools/flip_server/epoll_server.cc', + 'tools/flip_server/epoll_server.h', + 'tools/flip_server/flip_in_mem_edsm_server.cc', + 'tools/flip_server/http_message_constants.cc', + 'tools/flip_server/http_message_constants.h', + 'tools/flip_server/loadtime_measurement.h', + 'tools/flip_server/porting.txt', + 'tools/flip_server/ring_buffer.cc', + 'tools/flip_server/ring_buffer.h', + 'tools/flip_server/simple_buffer.cc', + 'tools/flip_server/simple_buffer.h', + 'tools/flip_server/split.h', + 'tools/flip_server/split.cc', + 'tools/flip_server/string_piece_utils.h', + 'tools/flip_server/thread.h', + 'tools/flip_server/url_to_filename_encoder.h', + 'tools/flip_server/url_utilities.h', + ], + }, + ] + }], ['OS=="linux"', { 'targets': [ { |