Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
diff --git a/net/net.gyp b/net/net.gyp
index b48a4c7..c4e47df 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -60,10 +60,13 @@
'net_resources',
],
'sources': [
+ 'android/cert_verify_result_android.cc',
'android/cert_verify_result_android.h',
- 'android/cert_verify_result_android_list.h',
+ 'android/cert_verify_status_android_list.h',
'android/gurl_utils.cc',
'android/gurl_utils.h',
+ 'android/android_private_key.cc',
+ 'android/android_private_key.h',
'android/keystore.cc',
'android/keystore.h',
'android/keystore_openssl.cc',
@@ -122,14 +125,8 @@
'base/file_stream_net_log_parameters.cc',
'base/file_stream_net_log_parameters.h',
'base/file_stream_whence.h',
- 'base/filter.cc',
- 'base/filter.h',
'base/int128.cc',
'base/int128.h',
- 'base/gzip_filter.cc',
- 'base/gzip_filter.h',
- 'base/gzip_header.cc',
- 'base/gzip_header.h',
'base/hash_value.cc',
'base/hash_value.h',
'base/host_mapping_rules.cc',
@@ -209,8 +206,6 @@
'base/registry_controlled_domains/registry_controlled_domain.h',
'base/request_priority.cc',
'base/request_priority.h',
- 'base/sdch_filter.cc',
- 'base/sdch_filter.h',
'base/sdch_manager.cc',
'base/sdch_manager.h',
'base/static_cookie_policy.cc',
@@ -220,8 +215,6 @@
'base/test_data_stream.h',
'base/upload_bytes_element_reader.cc',
'base/upload_bytes_element_reader.h',
- 'base/upload_data.cc',
- 'base/upload_data.h',
'base/upload_data_stream.cc',
'base/upload_data_stream.h',
'base/upload_element.cc',
@@ -297,6 +290,10 @@
'cert/multi_threaded_cert_verifier.h',
'cert/nss_cert_database.cc',
'cert/nss_cert_database.h',
+ 'cert/nss_cert_database_chromeos.cc',
+ 'cert/nss_cert_database_chromeos.h',
+ 'cert/nss_profile_filter_chromeos.cc',
+ 'cert/nss_profile_filter_chromeos.h',
'cert/pem_tokenizer.cc',
'cert/pem_tokenizer.h',
'cert/scoped_nss_types.h',
@@ -376,6 +373,7 @@
'disk_cache/file.cc',
'disk_cache/file.h',
'disk_cache/file_block.h',
+ 'disk_cache/file_ios.cc',
'disk_cache/file_lock.cc',
'disk_cache/file_lock.h',
'disk_cache/file_posix.cc',
@@ -452,9 +450,18 @@
'disk_cache/flash/segment.h',
'disk_cache/flash/storage.cc',
'disk_cache/flash/storage.h',
+ 'disk_cache/v3/backend_impl_v3.cc',
+ 'disk_cache/v3/backend_impl_v3.h',
'disk_cache/v3/block_bitmaps.cc',
'disk_cache/v3/block_bitmaps.h',
'disk_cache/v3/disk_format_v3.h',
+ 'disk_cache/v3/entry_impl_v3.cc',
+ 'disk_cache/v3/entry_impl_v3.h',
+ 'disk_cache/v3/eviction_v3.cc',
+ 'disk_cache/v3/eviction_v3.h',
+ 'disk_cache/v3/histogram_macros.h',
+ 'disk_cache/v3/index_table.cc',
+ 'disk_cache/v3/index_table.h',
'dns/address_sorter.h',
'dns/address_sorter_posix.cc',
'dns/address_sorter_posix.h',
@@ -467,6 +474,8 @@
'dns/dns_config_service_posix.h',
'dns/dns_config_service_win.cc',
'dns/dns_config_service_win.h',
+ 'dns/dns_config_watcher_mac.cc',
+ 'dns/dns_config_watcher_mac.h',
'dns/dns_hosts.cc',
'dns/dns_hosts.h',
'dns/dns_protocol.h',
@@ -506,6 +515,14 @@
'dns/serial_worker.h',
'dns/single_request_host_resolver.cc',
'dns/single_request_host_resolver.h',
+ 'filter/filter.cc',
+ 'filter/filter.h',
+ 'filter/gzip_filter.cc',
+ 'filter/gzip_filter.h',
+ 'filter/gzip_header.cc',
+ 'filter/gzip_header.h',
+ 'filter/sdch_filter.cc',
+ 'filter/sdch_filter.h',
'ftp/ftp_auth_cache.cc',
'ftp/ftp_auth_cache.h',
'ftp/ftp_ctrl_response_buffer.cc',
@@ -539,6 +556,10 @@
'ftp/ftp_util.h',
'http/des.cc',
'http/des.h',
+ 'http/disk_cache_based_quic_server_info.cc',
+ 'http/disk_cache_based_quic_server_info.h',
+ 'http/failing_http_transaction_factory.cc',
+ 'http/failing_http_transaction_factory.h',
'http/http_atom_list.h',
'http/http_auth.cc',
'http/http_auth.h',
@@ -638,7 +659,6 @@
'http/http_stream_parser.cc',
'http/http_stream_parser.h',
'http/http_transaction.h',
- 'http/http_transaction_delegate.h',
'http/http_transaction_factory.h',
'http/http_util.cc',
'http/http_util.h',
@@ -652,8 +672,8 @@
'http/partial_data.h',
'http/proxy_client_socket.h',
'http/proxy_client_socket.cc',
- 'http/proxy_connect_redirect_http_stream.h',
'http/proxy_connect_redirect_http_stream.cc',
+ 'http/proxy_connect_redirect_http_stream.h',
'http/transport_security_persister.cc',
'http/transport_security_persister.h',
'http/transport_security_state.cc',
@@ -783,6 +803,8 @@
'quic/crypto/crypto_framer.h',
'quic/crypto/crypto_handshake.cc',
'quic/crypto/crypto_handshake.h',
+ 'quic/crypto/crypto_handshake_message.cc',
+ 'quic/crypto/crypto_handshake_message.h',
'quic/crypto/crypto_protocol.h',
'quic/crypto/crypto_secret_boxer.cc',
'quic/crypto/crypto_secret_boxer.h',
@@ -819,8 +841,10 @@
'quic/crypto/quic_encrypter.h',
'quic/crypto/quic_random.cc',
'quic/crypto/quic_random.h',
- 'quic/crypto/scoped_evp_cipher_ctx.cc',
- 'quic/crypto/scoped_evp_cipher_ctx.h',
+ 'quic/crypto/quic_server_info.cc',
+ 'quic/crypto/quic_server_info.h',
+ 'quic/crypto/scoped_evp_aead_ctx.cc',
+ 'quic/crypto/scoped_evp_aead_ctx.h',
'quic/crypto/strike_register.cc',
'quic/crypto/strike_register.h',
'quic/crypto/strike_register_client.h',
@@ -828,6 +852,8 @@
'quic/crypto/source_address_token.h',
'quic/iovector.cc',
'quic/iovector.h',
+ 'quic/port_suggester.cc',
+ 'quic/port_suggester.h',
'quic/quic_ack_notifier.cc',
'quic/quic_ack_notifier.h',
'quic/quic_ack_notifier_manager.cc',
@@ -860,6 +886,8 @@
'quic/quic_crypto_stream.h',
'quic/quic_data_reader.cc',
'quic/quic_data_reader.h',
+ 'quic/quic_data_stream.cc',
+ 'quic/quic_data_stream.h',
'quic/quic_data_writer.cc',
'quic/quic_data_writer.h',
'quic/quic_default_packet_writer.cc',
@@ -868,6 +896,8 @@
'quic/quic_fec_group.h',
'quic/quic_framer.cc',
'quic/quic_framer.h',
+ 'quic/quic_headers_stream.cc',
+ 'quic/quic_headers_stream.h',
'quic/quic_http_stream.cc',
'quic/quic_http_stream.h',
'quic/quic_http_utils.cc',
@@ -889,6 +919,8 @@
'quic/quic_sent_packet_manager.h',
'quic/quic_session.cc',
'quic/quic_session.h',
+ 'quic/quic_socket_address_coder.cc',
+ 'quic/quic_socket_address_coder.h',
'quic/quic_spdy_compressor.cc',
'quic/quic_spdy_compressor.h',
'quic/quic_spdy_decompressor.cc',
@@ -901,6 +933,9 @@
'quic/quic_time.h',
'quic/quic_utils.cc',
'quic/quic_utils.h',
+ 'quic/quic_utils_chromium.h',
+ 'quic/quic_write_blocked_list.cc',
+ 'quic/quic_write_blocked_list.h',
'quic/reliable_quic_stream.cc',
'quic/reliable_quic_stream.h',
'quic/spdy_utils.cc',
@@ -983,6 +1018,23 @@
'socket_stream/socket_stream_metrics.h',
'spdy/buffered_spdy_framer.cc',
'spdy/buffered_spdy_framer.h',
+ 'spdy/hpack_constants.h',
+ 'spdy/hpack_decoder.cc',
+ 'spdy/hpack_decoder.h',
+ 'spdy/hpack_encoder.cc',
+ 'spdy/hpack_encoder.h',
+ 'spdy/hpack_encoding_context.cc',
+ 'spdy/hpack_encoding_context.h',
+ 'spdy/hpack_entry.cc',
+ 'spdy/hpack_entry.h',
+ 'spdy/hpack_header_table.cc',
+ 'spdy/hpack_header_table.h',
+ 'spdy/hpack_input_stream.cc',
+ 'spdy/hpack_input_stream.h',
+ 'spdy/hpack_output_stream.cc',
+ 'spdy/hpack_output_stream.h',
+ 'spdy/hpack_string_util.cc',
+ 'spdy/hpack_string_util.h',
'spdy/spdy_bitmasks.h',
'spdy/spdy_buffer.cc',
'spdy/spdy_buffer.h',
@@ -996,6 +1048,8 @@
'spdy/spdy_framer.h',
'spdy/spdy_header_block.cc',
'spdy/spdy_header_block.h',
+ 'spdy/spdy_headers_block_parser.cc',
+ 'spdy/spdy_headers_block_parser.h',
'spdy/spdy_http_stream.cc',
'spdy/spdy_http_stream.h',
'spdy/spdy_http_utils.cc',
@@ -1021,6 +1075,8 @@
'spdy/spdy_write_queue.h',
'spdy/write_blocked_list.h',
'ssl/client_cert_store.h',
+ 'ssl/client_cert_store_chromeos.cc',
+ 'ssl/client_cert_store_chromeos.h',
'ssl/client_cert_store_mac.cc',
'ssl/client_cert_store_mac.h',
'ssl/client_cert_store_nss.cc',
@@ -1093,6 +1149,8 @@
'url_request/url_fetcher_impl.h',
'url_request/url_fetcher_response_writer.cc',
'url_request/url_fetcher_response_writer.h',
+ 'url_request/url_range_request_job.cc',
+ 'url_request/url_range_request_job.h',
'url_request/url_request.cc',
'url_request/url_request.h',
'url_request/url_request_about_job.cc',
@@ -1175,6 +1233,10 @@
'websockets/websocket_handshake_constants.h',
'websockets/websocket_handshake_handler.cc',
'websockets/websocket_handshake_handler.h',
+ 'websockets/websocket_handshake_request_info.cc',
+ 'websockets/websocket_handshake_request_info.h',
+ 'websockets/websocket_handshake_response_info.cc',
+ 'websockets/websocket_handshake_response_info.h',
'websockets/websocket_handshake_stream_base.h',
'websockets/websocket_handshake_stream_create_helper.cc',
'websockets/websocket_handshake_stream_create_helper.h',
@@ -1341,8 +1403,8 @@
'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
'quic/crypto/channel_id_openssl.cc',
'quic/crypto/p256_key_exchange_openssl.cc',
- 'quic/crypto/scoped_evp_cipher_ctx.cc',
- 'quic/crypto/scoped_evp_cipher_ctx.h',
+ 'quic/crypto/scoped_evp_aead_ctx.cc',
+ 'quic/crypto/scoped_evp_aead_ctx.h',
'socket/ssl_client_socket_openssl.cc',
'socket/ssl_client_socket_openssl.h',
'socket/ssl_server_socket_openssl.cc',
@@ -1495,6 +1557,9 @@
'../third_party/nss/nss.gyp:nss',
'third_party/nss/ssl.gyp:libssl',
],
+ 'sources!': [
+ 'disk_cache/file_posix.cc',
+ ],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
@@ -1538,6 +1603,8 @@
['OS == "android"', {
'sources/': [
['include', '^base/platform_mime_util_linux\\.cc$'],
+ ['include', '^base/address_tracker_linux\\.cc$'],
+ ['include', '^base/address_tracker_linux\\.h$'],
],
}],
['OS == "ios"', {
@@ -1553,7 +1620,6 @@
['include', '^cert/test_root_certs_nss\\.cc$'],
['include', '^cert/x509_util_nss\\.cc$'],
['include', '^cert/x509_util_nss\\.h$'],
- ['include', '^dns/notify_watcher_mac\\.cc$'],
['include', '^proxy/proxy_resolver_mac\\.cc$'],
['include', '^proxy/proxy_server_mac\\.cc$'],
['include', '^ocsp/nss_ocsp\\.cc$'],
@@ -1591,17 +1657,13 @@
'base/escape_unittest.cc',
'base/expiring_cache_unittest.cc',
'base/file_stream_unittest.cc',
- 'base/filter_unittest.cc',
'base/int128_unittest.cc',
- 'base/gzip_filter_unittest.cc',
'base/host_mapping_rules_unittest.cc',
'base/host_port_pair_unittest.cc',
'base/ip_endpoint_unittest.cc',
'base/keygen_handler_unittest.cc',
'base/mime_sniffer_unittest.cc',
'base/mime_util_unittest.cc',
- 'base/mock_filter_context.cc',
- 'base/mock_filter_context.h',
'base/net_log_logger_unittest.cc',
'base/net_log_unittest.cc',
'base/net_log_unittest.h',
@@ -1610,7 +1672,7 @@
'base/prioritized_dispatcher_unittest.cc',
'base/priority_queue_unittest.cc',
'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
- 'base/sdch_filter_unittest.cc',
+ 'base/sdch_manager_unittest.cc',
'base/static_cookie_policy_unittest.cc',
'base/test_completion_callback_unittest.cc',
'base/upload_bytes_element_reader_unittest.cc',
@@ -1627,6 +1689,8 @@
'cert/multi_log_ct_verifier_unittest.cc',
'cert/multi_threaded_cert_verifier_unittest.cc',
'cert/nss_cert_database_unittest.cc',
+ 'cert/nss_cert_database_chromeos_unittest.cc',
+ 'cert/nss_profile_filter_chromeos_unittest.cc',
'cert/pem_tokenizer_unittest.cc',
'cert/signed_certificate_timestamp_unittest.cc',
'cert/test_root_certs_unittest.cc',
@@ -1660,6 +1724,7 @@
'disk_cache/flash/segment_unittest.cc',
'disk_cache/flash/storage_unittest.cc',
'disk_cache/v3/block_bitmaps_unittest.cc',
+ 'disk_cache/v3/index_table_unittest.cc',
'dns/address_sorter_posix_unittest.cc',
'dns/address_sorter_unittest.cc',
'dns/dns_config_service_posix_unittest.cc',
@@ -1679,6 +1744,11 @@
'dns/record_parsed_unittest.cc',
'dns/record_rdata_unittest.cc',
'dns/single_request_host_resolver_unittest.cc',
+ 'filter/filter_unittest.cc',
+ 'filter/gzip_filter_unittest.cc',
+ 'filter/mock_filter_context.cc',
+ 'filter/mock_filter_context.h',
+ 'filter/sdch_filter_unittest.cc',
'ftp/ftp_auth_cache_unittest.cc',
'ftp/ftp_ctrl_response_buffer_unittest.cc',
'ftp/ftp_directory_listing_parser_ls_unittest.cc',
@@ -1691,6 +1761,7 @@
'ftp/ftp_network_transaction_unittest.cc',
'ftp/ftp_util_unittest.cc',
'http/des_unittest.cc',
+ 'http/disk_cache_based_quic_server_info_unittest.cc',
'http/http_auth_cache_unittest.cc',
'http/http_auth_controller_unittest.cc',
'http/http_auth_filter_unittest.cc',
@@ -1801,6 +1872,7 @@
'quic/crypto/quic_random_test.cc',
'quic/crypto/strike_register_test.cc',
'quic/iovector_test.cc',
+ 'quic/port_suggester_unittest.cc',
'quic/test_tools/crypto_test_utils.cc',
'quic/test_tools/crypto_test_utils.h',
'quic/test_tools/crypto_test_utils_chromium.cc',
@@ -1820,6 +1892,8 @@
'quic/test_tools/quic_client_session_peer.h',
'quic/test_tools/quic_connection_peer.cc',
'quic/test_tools/quic_connection_peer.h',
+ 'quic/test_tools/quic_data_stream_peer.cc',
+ 'quic/test_tools/quic_data_stream_peer.h',
'quic/test_tools/quic_framer_peer.cc',
'quic/test_tools/quic_framer_peer.h',
'quic/test_tools/quic_packet_creator_peer.cc',
@@ -1830,10 +1904,10 @@
'quic/test_tools/quic_sent_packet_manager_peer.h',
'quic/test_tools/quic_session_peer.cc',
'quic/test_tools/quic_session_peer.h',
+ 'quic/test_tools/quic_test_packet_maker.cc',
+ 'quic/test_tools/quic_test_packet_maker.h',
'quic/test_tools/quic_test_utils.cc',
'quic/test_tools/quic_test_utils.h',
- 'quic/test_tools/quic_test_writer.cc',
- 'quic/test_tools/quic_test_writer.h',
'quic/test_tools/reliable_quic_stream_peer.cc',
'quic/test_tools/reliable_quic_stream_peer.h',
'quic/test_tools/simple_quic_framer.cc',
@@ -1851,9 +1925,11 @@
'quic/quic_crypto_client_stream_test.cc',
'quic/quic_crypto_server_stream_test.cc',
'quic/quic_crypto_stream_test.cc',
+ 'quic/quic_data_stream_test.cc',
'quic/quic_data_writer_test.cc',
'quic/quic_fec_group_test.cc',
'quic/quic_framer_test.cc',
+ 'quic/quic_headers_stream_test.cc',
'quic/quic_http_stream_test.cc',
'quic/quic_http_utils_test.cc',
'quic/quic_network_transaction_unittest.cc',
@@ -1865,12 +1941,15 @@
'quic/quic_sent_entropy_manager_test.cc',
'quic/quic_sent_packet_manager_test.cc',
'quic/quic_session_test.cc',
+ 'quic/quic_socket_address_coder_test.cc',
'quic/quic_spdy_compressor_test.cc',
'quic/quic_spdy_decompressor_test.cc',
'quic/quic_stream_factory_test.cc',
'quic/quic_stream_sequencer_test.cc',
'quic/quic_time_test.cc',
+ 'quic/quic_utils_chromium_test.cc',
'quic/quic_utils_test.cc',
+ 'quic/quic_write_blocked_list_test.cc',
'quic/reliable_quic_stream_test.cc',
'server/http_server_response_info_unittest.cc',
'server/http_server_unittest.cc',
@@ -1898,11 +1977,22 @@
'socket_stream/socket_stream_metrics_unittest.cc',
'socket_stream/socket_stream_unittest.cc',
'spdy/buffered_spdy_framer_unittest.cc',
+ 'spdy/hpack_decoder_test.cc',
+ 'spdy/hpack_encoder_test.cc',
+ 'spdy/hpack_encoding_context_test.cc',
+ 'spdy/hpack_entry_test.cc',
+ 'spdy/hpack_header_table_test.cc',
+ 'spdy/hpack_input_stream_test.cc',
+ 'spdy/hpack_output_stream_test.cc',
+ 'spdy/hpack_string_util_test.cc',
+ 'spdy/mock_spdy_framer_visitor.cc',
+ 'spdy/mock_spdy_framer_visitor.h',
'spdy/spdy_buffer_unittest.cc',
'spdy/spdy_frame_builder_test.cc',
'spdy/spdy_frame_reader_test.cc',
'spdy/spdy_framer_test.cc',
'spdy/spdy_header_block_unittest.cc',
+ 'spdy/spdy_headers_block_parser_test.cc',
'spdy/spdy_http_stream_unittest.cc',
'spdy/spdy_http_utils_unittest.cc',
'spdy/spdy_network_transaction_unittest.cc',
@@ -1926,6 +2016,7 @@
'spdy/spdy_websocket_test_util.h',
'spdy/spdy_write_queue_unittest.cc',
'spdy/write_blocked_list_test.cc',
+ 'ssl/client_cert_store_chromeos_unittest.cc',
'ssl/client_cert_store_mac_unittest.cc',
'ssl/client_cert_store_nss_unittest.cc',
'ssl/client_cert_store_unittest-inl.h',
@@ -1936,11 +2027,16 @@
'ssl/ssl_cipher_suite_names_unittest.cc',
'ssl/ssl_client_auth_cache_unittest.cc',
'ssl/ssl_config_service_unittest.cc',
+ 'test/gtest_util.h',
'test/embedded_test_server/embedded_test_server_unittest.cc',
'test/embedded_test_server/http_request_unittest.cc',
'test/embedded_test_server/http_response_unittest.cc',
'test/python_utils_unittest.cc',
'test/run_all_unittests.cc',
+ 'test/scoped_disable_exit_on_dfatal.cc',
+ 'test/scoped_disable_exit_on_dfatal.h',
+ 'test/scoped_mock_log.cc',
+ 'test/scoped_mock_log.h',
'test/test_certificate_data.h',
'tools/dump_cache/url_to_filename_encoder.cc',
'tools/dump_cache/url_to_filename_encoder.h',
@@ -1957,6 +2053,7 @@
'url_request/url_request_http_job_unittest.cc',
'url_request/url_request_job_factory_impl_unittest.cc',
'url_request/url_request_job_unittest.cc',
+ 'url_request/url_request_simple_job_unittest.cc',
'url_request/url_request_throttler_simulation_unittest.cc',
'url_request/url_request_throttler_test_support.cc',
'url_request/url_request_throttler_test_support.h',
@@ -2001,10 +2098,9 @@
'tools/quic/quic_epoll_clock_test.cc',
'tools/quic/quic_epoll_connection_helper_test.cc',
'tools/quic/quic_in_memory_cache_test.cc',
- 'tools/quic/quic_reliable_client_stream_test.cc',
- 'tools/quic/quic_reliable_server_stream_test.cc',
'tools/quic/quic_server_session_test.cc',
'tools/quic/quic_server_test.cc',
+ 'tools/quic/quic_spdy_client_stream_test.cc',
'tools/quic/quic_spdy_server_stream_test.cc',
'tools/quic/quic_time_wait_list_manager_test.cc',
'tools/quic/test_tools/http_message_test_utils.cc',
@@ -2039,6 +2135,8 @@
}],
[ 'OS == "android"', {
'sources!': [
+ # See bug 344533.
+ 'disk_cache/v3/index_table_unittest.cc',
# No res_ninit() et al on Android, so this doesn't make a lot of
# sense.
'dns/dns_config_service_posix_unittest.cc',
@@ -2176,14 +2274,20 @@
'dns/dns_config_service_posix_unittest.cc',
'http/http_auth_gssapi_posix_unittest.cc',
],
- # This is needed to trigger the dll copy step on windows.
- # TODO(mark): Specifying this here shouldn't be necessary.
'dependencies': [
- '../third_party/icu/icu.gyp:icudata',
'../third_party/nss/nss.gyp:nspr',
'../third_party/nss/nss.gyp:nss',
'third_party/nss/ssl.gyp:libssl',
],
+ 'conditions': [
+ [ 'icu_use_data_file_flag == 0', {
+ # This is needed to trigger the dll copy step on windows.
+ # TODO(mark): Specifying this here shouldn't be necessary.
+ 'dependencies': [
+ '../third_party/icu/icu.gyp:icudata',
+ ],
+ }],
+ ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
},
@@ -2219,10 +2323,10 @@
# implementation is missing or incomplete.
# KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
'base/keygen_handler_unittest.cc',
- # Need to read input data files.
- 'base/gzip_filter_unittest.cc',
'disk_cache/backend_unittest.cc',
'disk_cache/block_files_unittest.cc',
+ # Need to read input data files.
+ 'filter/gzip_filter_unittest.cc',
'socket/ssl_server_socket_unittest.cc',
# Need TestServer.
'proxy/proxy_script_fetcher_impl_unittest.cc',
@@ -2236,6 +2340,9 @@
# iOS.
# OS is not "linux" or "freebsd" or "openbsd".
'socket/unix_domain_socket_posix_unittest.cc',
+
+ # See bug 344533.
+ 'disk_cache/v3/index_table_unittest.cc',
],
}],
[ 'OS == "android"', {
@@ -2253,6 +2360,17 @@
]
}],
],
+ 'target_conditions': [
+ # These source files are excluded by default platform rules, but they
+ # are needed in specific cases on other platforms. Re-including them can
+ # only be done in target_conditions as it is evaluated after the
+ # platform rules.
+ ['OS == "android"', {
+ 'sources/': [
+ ['include', '^base/address_tracker_linux_unittest\\.cc$'],
+ ],
+ }],
+ ],
},
{
'target_name': 'net_perftests',
@@ -2282,16 +2400,19 @@
],
},
],
- # This is needed to trigger the dll copy step on windows.
- # TODO(mark): Specifying this here shouldn't be necessary.
[ 'OS == "win"', {
- 'dependencies': [
- '../third_party/icu/icu.gyp:icudata',
+ 'conditions': [
+ [ 'icu_use_data_file_flag == 0', {
+ # This is needed to trigger the dll copy step on windows.
+ # TODO(mark): Specifying this here shouldn't be necessary.
+ 'dependencies': [
+ '../third_party/icu/icu.gyp:icudata',
+ ],
+ }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
- },
- ],
+ }],
],
},
{
@@ -2536,7 +2657,7 @@
},
],
}],
- ['OS != "ios"', {
+ ['OS != "ios" and OS != "android"', {
'targets': [
# iOS doesn't have the concept of simple executables, these targets
# can't be compiled on the platform.
@@ -2864,10 +2985,8 @@
'tools/quic/quic_epoll_connection_helper.h',
'tools/quic/quic_in_memory_cache.cc',
'tools/quic/quic_in_memory_cache.h',
- 'tools/quic/quic_reliable_client_stream.cc',
- 'tools/quic/quic_reliable_client_stream.h',
- 'tools/quic/quic_reliable_server_stream.cc',
- 'tools/quic/quic_reliable_server_stream.h',
+ 'tools/quic/quic_packet_writer_wrapper.cc',
+ 'tools/quic/quic_packet_writer_wrapper.h',
'tools/quic/quic_server.cc',
'tools/quic/quic_server.h',
'tools/quic/quic_server_session.cc',
@@ -2918,8 +3037,10 @@
'target_name': 'net_jni_headers',
'type': 'none',
'sources': [
+ 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
'android/java/src/org/chromium/net/AndroidKeyStore.java',
'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
+ 'android/java/src/org/chromium/net/AndroidPrivateKey.java',
'android/java/src/org/chromium/net/GURLUtils.java',
'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
'android/java/src/org/chromium/net/ProxyChangeListener.java',
@@ -2929,11 +3050,6 @@
'jni_gen_package': 'net',
'jni_generator_ptr_type': 'long',
},
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/net',
- ],
- },
'includes': [ '../build/jni_generator.gypi' ],
},
{
@@ -2946,11 +3062,6 @@
'jni_gen_package': 'net',
'jni_generator_ptr_type': 'long',
},
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/net',
- ],
- },
'includes': [ '../build/jni_generator.gypi' ],
},
{
@@ -2961,14 +3072,29 @@
},
'dependencies': [
'../base/base.gyp:base',
- 'cert_verify_result_android_java',
+ 'cert_verify_status_android_java',
'certificate_mime_types_java',
'net_errors_java',
'private_key_types_java',
+ 'remote_android_keystore_aidl',
],
'includes': [ '../build/java.gypi' ],
},
{
+ # Processes the interface files for communication with an Android KeyStore
+ # running in a separate process.
+ 'target_name': 'remote_android_keystore_aidl',
+ 'type': 'none',
+ 'variables': {
+ 'aidl_interface_file': '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl',
+ },
+ 'sources': [
+ '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl',
+ '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl',
+ ],
+ 'includes': [ '../build/java_aidl.gypi' ],
+ },
+ {
'target_name': 'net_java_test_support',
'type': 'none',
'variables': {
@@ -3014,14 +3140,14 @@
'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
- 'target_name': 'cert_verify_result_android_java',
+ 'target_name': 'cert_verify_status_android_java',
'type': 'none',
'sources': [
- 'android/java/CertVerifyResultAndroid.template',
+ 'android/java/CertVerifyStatusAndroid.template',
],
'variables': {
'package_name': 'org/chromium/net',
- 'template_deps': ['android/cert_verify_result_android_list.h'],
+ 'template_deps': ['android/cert_verify_status_android_list.h'],
},
'includes': [ '../build/android/java_cpp_template.gypi' ],
},