Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index d1a83aaa69bb267aa83f8b2d915f0eb9b00e591d..6c8f722814c571458479e14358eede93cdd7d751 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -41,6 +41,7 @@ |
}, |
'includes': [ |
'../build/win_precompile.gypi', |
+ 'net.gypi', |
], |
'targets': [ |
{ |
@@ -60,6 +61,7 @@ |
'net_resources', |
], |
'sources': [ |
+ '<@(net_nacl_common_sources)', |
'android/cert_verify_result_android.cc', |
'android/cert_verify_result_android.h', |
'android/cert_verify_status_android_list.h', |
@@ -81,21 +83,13 @@ |
'android/network_change_notifier_factory_android.h', |
'android/network_library.cc', |
'android/network_library.h', |
- 'base/address_family.h', |
- 'base/address_list.cc', |
- 'base/address_list.h', |
'base/address_tracker_linux.cc', |
'base/address_tracker_linux.h', |
- 'base/auth.cc', |
- 'base/auth.h', |
'base/backoff_entry.cc', |
'base/backoff_entry.h', |
'base/bandwidth_metrics.cc', |
'base/bandwidth_metrics.h', |
'base/cache_type.h', |
- 'base/completion_callback.h', |
- 'base/connection_type_histograms.cc', |
- 'base/connection_type_histograms.h', |
'base/crypto_module.h', |
'base/crypto_module_nss.cc', |
'base/crypto_module_openssl.cc', |
@@ -105,10 +99,6 @@ |
'base/directory_lister.h', |
'base/dns_reloader.cc', |
'base/dns_reloader.h', |
- 'base/dns_util.cc', |
- 'base/dns_util.h', |
- 'base/escape.cc', |
- 'base/escape.h', |
'base/expiring_cache.h', |
'base/file_stream.cc', |
'base/file_stream.h', |
@@ -125,19 +115,11 @@ |
'base/file_stream_whence.h', |
'base/filename_util.cc', |
'base/filename_util.h', |
- 'base/hash_value.cc', |
- 'base/hash_value.h', |
'base/host_mapping_rules.cc', |
'base/host_mapping_rules.h', |
- 'base/host_port_pair.cc', |
- 'base/host_port_pair.h', |
'base/int128.cc', |
'base/int128.h', |
- 'base/io_buffer.cc', |
- 'base/io_buffer.h', |
'base/iovec.h', |
- 'base/ip_endpoint.cc', |
- 'base/ip_endpoint.h', |
'base/ip_pattern.cc', |
'base/ip_pattern.h', |
'base/keygen_handler.cc', |
@@ -151,29 +133,13 @@ |
'base/load_flags_list.h', |
'base/load_states.h', |
'base/load_states_list.h', |
- 'base/load_timing_info.cc', |
- 'base/load_timing_info.h', |
'base/mime_sniffer.cc', |
'base/mime_sniffer.h', |
'base/mime_util.cc', |
'base/mime_util.h', |
- 'base/net_error_list.h', |
- 'base/net_errors.cc', |
- 'base/net_errors.h', |
- 'base/net_errors_posix.cc', |
'base/net_errors_win.cc', |
- 'base/net_export.h', |
- 'base/net_log.cc', |
- 'base/net_log.h', |
'base/net_log_logger.cc', |
'base/net_log_logger.h', |
- 'base/net_log_event_type_list.h', |
- 'base/net_log_source_type_list.h', |
- 'base/net_module.cc', |
- 'base/net_module.h', |
- 'base/net_util.cc', |
- 'base/net_util.h', |
- 'base/net_util_posix.cc', |
'base/net_util_win.cc', |
'base/network_change_notifier.cc', |
'base/network_change_notifier.h', |
@@ -192,9 +158,6 @@ |
'base/network_time_notifier.h', |
'base/nss_memio.c', |
'base/nss_memio.h', |
- 'base/openssl_private_key_store.h', |
- 'base/openssl_private_key_store_android.cc', |
- 'base/openssl_private_key_store_memory.cc', |
'base/platform_mime_util.h', |
# TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? |
'base/platform_mime_util_linux.cc', |
@@ -203,16 +166,12 @@ |
'base/prioritized_dispatcher.cc', |
'base/prioritized_dispatcher.h', |
'base/priority_queue.h', |
- 'base/rand_callback.h', |
- 'base/registry_controlled_domains/registry_controlled_domain.cc', |
- 'base/registry_controlled_domains/registry_controlled_domain.h', |
'base/request_priority.cc', |
'base/request_priority.h', |
'base/sdch_manager.cc', |
'base/sdch_manager.h', |
'base/static_cookie_policy.cc', |
'base/static_cookie_policy.h', |
- 'base/sys_addrinfo.h', |
'base/test_data_stream.cc', |
'base/test_data_stream.h', |
'base/upload_bytes_element_reader.cc', |
@@ -232,23 +191,12 @@ |
'base/winsock_init.h', |
'base/winsock_util.cc', |
'base/winsock_util.h', |
- 'base/zap.cc', |
- 'base/zap.h', |
- 'cert/asn1_util.cc', |
- 'cert/asn1_util.h', |
- 'cert/cert_database.cc', |
- 'cert/cert_database.h', |
'cert/cert_database_android.cc', |
'cert/cert_database_ios.cc', |
'cert/cert_database_mac.cc', |
'cert/cert_database_nss.cc', |
- 'cert/cert_database_openssl.cc', |
'cert/cert_database_win.cc', |
- 'cert/cert_status_flags.cc', |
- 'cert/cert_status_flags.h', |
'cert/cert_trust_anchor_provider.h', |
- 'cert/cert_verifier.cc', |
- 'cert/cert_verifier.h', |
'cert/cert_verify_proc.cc', |
'cert/cert_verify_proc.h', |
'cert/cert_verify_proc_android.cc', |
@@ -261,8 +209,6 @@ |
'cert/cert_verify_proc_openssl.h', |
'cert/cert_verify_proc_win.cc', |
'cert/cert_verify_proc_win.h', |
- 'cert/cert_verify_result.cc', |
- 'cert/cert_verify_result.h', |
'cert/crl_set.cc', |
'cert/crl_set.h', |
'cert/ct_known_logs.cc', |
@@ -283,9 +229,9 @@ |
'cert/ct_verify_result.h', |
'cert/ev_root_ca_metadata.cc', |
'cert/ev_root_ca_metadata.h', |
+ 'cert/jwk_serializer.h', |
'cert/jwk_serializer_nss.cc', |
'cert/jwk_serializer_openssl.cc', |
- 'cert/jwk_serializer.h', |
'cert/multi_log_ct_verifier.cc', |
'cert/multi_log_ct_verifier.h', |
'cert/multi_threaded_cert_verifier.cc', |
@@ -296,14 +242,8 @@ |
'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', |
'cert/sct_status_flags.h', |
- 'cert/signed_certificate_timestamp.cc', |
- 'cert/signed_certificate_timestamp.h', |
- 'cert/single_request_cert_verifier.cc', |
- 'cert/single_request_cert_verifier.h', |
'cert/test_root_certs.cc', |
'cert/test_root_certs.h', |
'cert/test_root_certs_android.cc', |
@@ -311,21 +251,12 @@ |
'cert/test_root_certs_nss.cc', |
'cert/test_root_certs_openssl.cc', |
'cert/test_root_certs_win.cc', |
- 'cert/x509_cert_types.cc', |
- 'cert/x509_cert_types.h', |
'cert/x509_cert_types_mac.cc', |
'cert/x509_cert_types_win.cc', |
- 'cert/x509_certificate.cc', |
- 'cert/x509_certificate.h', |
'cert/x509_certificate_ios.cc', |
'cert/x509_certificate_mac.cc', |
- 'cert/x509_certificate_net_log_param.cc', |
- 'cert/x509_certificate_net_log_param.h', |
'cert/x509_certificate_nss.cc', |
- 'cert/x509_certificate_openssl.cc', |
'cert/x509_certificate_win.cc', |
- 'cert/x509_util.cc', |
- 'cert/x509_util.h', |
'cert/x509_util_android.cc', |
'cert/x509_util_android.h', |
'cert/x509_util_ios.cc', |
@@ -334,8 +265,6 @@ |
'cert/x509_util_mac.h', |
'cert/x509_util_nss.cc', |
'cert/x509_util_nss.h', |
- 'cert/x509_util_openssl.cc', |
- 'cert/x509_util_openssl.h', |
'cookies/canonical_cookie.cc', |
'cookies/canonical_cookie.h', |
'cookies/cookie_constants.cc', |
@@ -549,15 +478,13 @@ |
'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/failing_http_transaction_factory.cc', |
+ 'http/failing_http_transaction_factory.h', |
'http/http_atom_list.h', |
'http/http_auth.cc', |
'http/http_auth.h', |
'http/http_auth_cache.cc', |
'http/http_auth_cache.h', |
- 'http/http_auth_challenge_tokenizer.cc', |
- 'http/http_auth_challenge_tokenizer.h', |
'http/http_auth_controller.cc', |
'http/http_auth_controller.h', |
'http/http_auth_filter.cc', |
@@ -585,18 +512,14 @@ |
'http/http_basic_state.h', |
'http/http_basic_stream.cc', |
'http/http_basic_stream.h', |
- 'http/http_byte_range.cc', |
- 'http/http_byte_range.h', |
'http/http_cache.cc', |
'http/http_cache.h', |
'http/http_cache_transaction.cc', |
'http/http_cache_transaction.h', |
- 'http/http_content_disposition.cc', |
- 'http/http_content_disposition.h', |
'http/http_chunked_decoder.cc', |
'http/http_chunked_decoder.h', |
- 'http/http_log_util.cc', |
- 'http/http_log_util.h', |
+ 'http/http_content_disposition.cc', |
+ 'http/http_content_disposition.h', |
'http/http_network_layer.cc', |
'http/http_network_layer.h', |
'http/http_network_session.cc', |
@@ -623,18 +546,10 @@ |
'http/http_proxy_client_socket.h', |
'http/http_proxy_client_socket_pool.cc', |
'http/http_proxy_client_socket_pool.h', |
- 'http/http_request_headers.cc', |
- 'http/http_request_headers.h', |
'http/http_request_info.cc', |
'http/http_request_info.h', |
'http/http_response_body_drainer.cc', |
'http/http_response_body_drainer.h', |
- 'http/http_response_headers.cc', |
- 'http/http_response_headers.h', |
- 'http/http_response_info.cc', |
- 'http/http_response_info.h', |
- 'http/http_security_headers.cc', |
- 'http/http_security_headers.h', |
'http/http_server_properties.cc', |
'http/http_server_properties.h', |
'http/http_server_properties_impl.cc', |
@@ -655,24 +570,17 @@ |
'http/http_stream_parser.h', |
'http/http_transaction.h', |
'http/http_transaction_factory.h', |
- 'http/http_util.cc', |
- 'http/http_util.h', |
- 'http/http_util_icu.cc', |
- 'http/http_vary_data.cc', |
- 'http/http_vary_data.h', |
'http/http_version.h', |
'http/md4.cc', |
'http/md4.h', |
'http/partial_data.cc', |
'http/partial_data.h', |
- 'http/proxy_client_socket.h', |
'http/proxy_client_socket.cc', |
+ 'http/proxy_client_socket.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', |
- 'http/transport_security_state.h', |
'http/transport_security_state_static.h', |
'http/url_security_manager.cc', |
'http/url_security_manager.h', |
@@ -860,11 +768,11 @@ |
'quic/crypto/quic_server_info.h', |
'quic/crypto/scoped_evp_aead_ctx.cc', |
'quic/crypto/scoped_evp_aead_ctx.h', |
+ 'quic/crypto/source_address_token.cc', |
+ 'quic/crypto/source_address_token.h', |
'quic/crypto/strike_register.cc', |
'quic/crypto/strike_register.h', |
'quic/crypto/strike_register_client.h', |
- 'quic/crypto/source_address_token.cc', |
- 'quic/crypto/source_address_token.h', |
'quic/iovector.cc', |
'quic/iovector.h', |
'quic/port_suggester.cc', |
@@ -965,19 +873,14 @@ |
'socket/buffered_write_stream_socket.h', |
'socket/client_socket_factory.cc', |
'socket/client_socket_factory.h', |
- 'socket/client_socket_handle.cc', |
- 'socket/client_socket_handle.h', |
'socket/client_socket_pool.cc', |
'socket/client_socket_pool.h', |
'socket/client_socket_pool_base.cc', |
'socket/client_socket_pool_base.h', |
- 'socket/client_socket_pool_histograms.cc', |
- 'socket/client_socket_pool_histograms.h', |
'socket/client_socket_pool_manager.cc', |
'socket/client_socket_pool_manager.h', |
'socket/client_socket_pool_manager_impl.cc', |
'socket/client_socket_pool_manager_impl.h', |
- 'socket/next_proto.h', |
'socket/nss_ssl_util.cc', |
'socket/nss_ssl_util.h', |
'socket/server_socket.h', |
@@ -985,30 +888,18 @@ |
'socket/socket_descriptor.h', |
'socket/socket_net_log_params.cc', |
'socket/socket_net_log_params.h', |
- 'socket/socket.h', |
'socket/socks5_client_socket.cc', |
'socket/socks5_client_socket.h', |
'socket/socks_client_socket.cc', |
'socket/socks_client_socket.h', |
'socket/socks_client_socket_pool.cc', |
'socket/socks_client_socket_pool.h', |
- 'socket/ssl_client_socket.cc', |
- 'socket/ssl_client_socket.h', |
'socket/ssl_client_socket_nss.cc', |
'socket/ssl_client_socket_nss.h', |
- 'socket/ssl_client_socket_openssl.cc', |
- 'socket/ssl_client_socket_openssl.h', |
- 'socket/ssl_client_socket_pool.cc', |
- 'socket/ssl_client_socket_pool.h', |
- 'socket/ssl_error_params.cc', |
- 'socket/ssl_error_params.h', |
'socket/ssl_server_socket.h', |
'socket/ssl_server_socket_nss.cc', |
'socket/ssl_server_socket_nss.h', |
'socket/ssl_server_socket_openssl.cc', |
- 'socket/ssl_session_cache_openssl.cc', |
- 'socket/ssl_session_cache_openssl.h', |
- 'socket/ssl_socket.h', |
'socket/stream_listen_socket.cc', |
'socket/stream_listen_socket.h', |
'socket/stream_socket.cc', |
@@ -1111,31 +1002,12 @@ |
'ssl/client_cert_store_nss.h', |
'ssl/client_cert_store_win.cc', |
'ssl/client_cert_store_win.h', |
- 'ssl/default_server_bound_cert_store.cc', |
- 'ssl/default_server_bound_cert_store.h', |
- 'ssl/openssl_client_key_store.cc', |
- 'ssl/openssl_client_key_store.h', |
- 'ssl/server_bound_cert_service.cc', |
- 'ssl/server_bound_cert_service.h', |
- 'ssl/server_bound_cert_store.cc', |
- 'ssl/server_bound_cert_store.h', |
- 'ssl/signed_certificate_timestamp_and_status.cc', |
- 'ssl/signed_certificate_timestamp_and_status.h', |
- 'ssl/ssl_cert_request_info.cc', |
- 'ssl/ssl_cert_request_info.h', |
'ssl/ssl_cipher_suite_names.cc', |
'ssl/ssl_cipher_suite_names.h', |
- 'ssl/ssl_client_auth_cache.cc', |
- 'ssl/ssl_client_auth_cache.h', |
- 'ssl/ssl_client_cert_type.h', |
- 'ssl/ssl_config.cc', |
- 'ssl/ssl_config.h', |
'ssl/ssl_config_service.cc', |
'ssl/ssl_config_service.h', |
'ssl/ssl_config_service_defaults.cc', |
'ssl/ssl_config_service_defaults.h', |
- 'ssl/ssl_info.cc', |
- 'ssl/ssl_info.h', |
'third_party/mozilla_security_manager/nsKeygenHandler.cpp', |
'third_party/mozilla_security_manager/nsKeygenHandler.h', |
'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', |