Skip to content

GitLab

T
tangled
Commit cd0f6a46 authored by Matt Menke's avatar Matt Menke Committed by Commit Bot
Browse files
Options

Remove source filters in net/BUILD.gn. 

This CL results in some warts (double is_win sections and the like)
that I'll clean up in a followup CL.

Bug: 1018739
Change-Id: I912161a34b293a47e179c0b983c162d4ac96af06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1885654Reviewed-by: default avatarEric Roman <eroman@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710799}
parent d052da3e
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 188 deletions
net/BUILD.gn
View file @ cd0f6a46
......@@ -109,6 +109,8 @@ if (is_linux) {
net_configs += [ "//build/config/linux:libresolv" ]
}
set_sources_assignment_filter([])
source_set("constants") {
sources = [
"base/trace_constants.h",
......@@ -344,8 +346,6 @@ component("net") {
"socket/stream_socket.h",
"ssl/client_cert_identity.cc",
"ssl/client_cert_identity.h",
"ssl/client_cert_identity_mac.cc",
"ssl/client_cert_identity_mac.h",
"ssl/openssl_ssl_util.cc",
"ssl/openssl_ssl_util.h",
"ssl/ssl_cert_request_info.cc",
......@@ -375,7 +375,6 @@ component("net") {
"third_party/uri_template/uri_template.cc",
"third_party/uri_template/uri_template.h",
]
net_unfiltered_sources = []
if (is_posix || is_fuchsia) {
sources += [ "base/net_errors_posix.cc" ]
......@@ -414,28 +413,6 @@ component("net") {
if (!is_nacl) {
sources += [
"android/android_http_util.cc",
"android/cellular_signal_strength.cc",
"android/cellular_signal_strength.h",
"android/cert_verify_result_android.cc",
"android/cert_verify_result_android.h",
"android/gurl_utils.cc",
"android/http_auth_negotiate_android.cc",
"android/http_auth_negotiate_android.h",
"android/keystore.cc",
"android/keystore.h",
"android/network_change_notifier_android.cc",
"android/network_change_notifier_android.h",
"android/network_change_notifier_delegate_android.cc",
"android/network_change_notifier_delegate_android.h",
"android/network_change_notifier_factory_android.cc",
"android/network_change_notifier_factory_android.h",
"android/network_library.cc",
"android/network_library.h",
"android/traffic_stats.cc",
"android/traffic_stats.h",
"base/address_tracker_linux.cc",
"base/address_tracker_linux.h",
"base/backoff_entry.cc",
"base/backoff_entry.h",
"base/backoff_entry_serializer.cc",
......@@ -454,7 +431,6 @@ component("net") {
"base/file_stream.h",
"base/file_stream_context.cc",
"base/file_stream_context.h",
"base/file_stream_context_win.cc",
"base/filename_util.cc",
"base/filename_util.h",
"base/filename_util_internal.cc",
......@@ -476,38 +452,20 @@ component("net") {
"base/mime_sniffer.h",
"base/mime_util.cc",
"base/mime_util.h",
"base/net_errors_win.cc",
"base/net_info_source_list.h",
"base/network_activity_monitor.cc",
"base/network_activity_monitor.h",
"base/network_change_notifier.cc",
"base/network_change_notifier.h",
"base/network_change_notifier_factory.h",
"base/network_change_notifier_linux.cc",
"base/network_change_notifier_linux.h",
"base/network_change_notifier_mac.cc",
"base/network_change_notifier_mac.h",
"base/network_change_notifier_win.cc",
"base/network_change_notifier_win.h",
"base/network_config_watcher_mac.cc",
"base/network_config_watcher_mac.h",
"base/network_delegate.cc",
"base/network_delegate.h",
"base/network_delegate_impl.cc",
"base/network_delegate_impl.h",
"base/network_interfaces_linux.cc",
"base/network_interfaces_linux.h",
"base/network_interfaces_nacl.cc",
"base/network_interfaces_win.cc",
"base/network_interfaces_win.h",
"base/network_isolation_key.cc",
"base/network_isolation_key.h",
"base/network_notification_thread_mac.cc",
"base/network_notification_thread_mac.h",
"base/platform_mime_util.h",
"base/platform_mime_util_linux.cc",
"base/platform_mime_util_mac.mm",
"base/platform_mime_util_win.cc",
"base/prioritized_dispatcher.cc",
"base/prioritized_dispatcher.h",
"base/prioritized_task_runner.cc",
......@@ -516,7 +474,6 @@ component("net") {
"base/proxy_delegate.h",
"base/proxy_server.cc",
"base/proxy_server.h",
"base/proxy_server_mac.cc",
"base/request_priority.cc",
"base/request_priority.h",
"base/static_cookie_policy.cc",
......@@ -532,28 +489,15 @@ component("net") {
"base/upload_file_element_reader.cc",
"base/upload_file_element_reader.h",
"base/upload_progress.h",
"base/winsock_init.cc",
"base/winsock_init.h",
"base/winsock_util.cc",
"base/winsock_util.h",
"cert/caching_cert_verifier.cc",
"cert/caching_cert_verifier.h",
"cert/cert_database_mac.cc",
"cert/cert_net_fetcher.h",
"cert/cert_verify_proc.cc",
"cert/cert_verify_proc.h",
"cert/cert_verify_proc_android.cc",
"cert/cert_verify_proc_android.h",
"cert/cert_verify_proc_builtin.cc",
"cert/cert_verify_proc_builtin.h",
"cert/cert_verify_proc_ios.cc",
"cert/cert_verify_proc_ios.h",
"cert/cert_verify_proc_mac.cc",
"cert/cert_verify_proc_mac.h",
"cert/cert_verify_proc_nss.cc",
"cert/cert_verify_proc_nss.h",
"cert/cert_verify_proc_win.cc",
"cert/cert_verify_proc_win.h",
"cert/coalescing_cert_verifier.cc",
"cert/coalescing_cert_verifier.h",
"cert/ct_log_response_parser.cc",
......@@ -575,20 +519,14 @@ component("net") {
"cert/internal/system_trust_store.cc",
"cert/internal/system_trust_store.h",
"cert/internal/system_trust_store_nss.h",
"cert/internal/trust_store_mac.cc",
"cert/internal/trust_store_mac.h",
"cert/internal/trust_store_nss.cc",
"cert/internal/trust_store_nss.h",
"cert/jwk_serializer.cc",
"cert/jwk_serializer.h",
"cert/known_roots.cc",
"cert/known_roots.h",
"cert/known_roots_mac.cc",
"cert/known_roots_mac.h",
"cert/known_roots_nss.cc",
"cert/known_roots_nss.h",
"cert/known_roots_win.cc",
"cert/known_roots_win.h",
"cert/merkle_audit_proof.cc",
"cert/merkle_audit_proof.h",
"cert/merkle_consistency_proof.cc",
......@@ -601,30 +539,12 @@ component("net") {
"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/root_cert_list_generated.h",
"cert/test_keychain_search_list_mac.cc",
"cert/test_keychain_search_list_mac.h",
"cert/test_root_certs.cc",
"cert/test_root_certs.h",
"cert/test_root_certs_android.cc",
"cert/test_root_certs_mac.cc",
"cert/test_root_certs_nss.cc",
"cert/test_root_certs_win.cc",
"cert/x509_util_android.cc",
"cert/x509_util_ios.cc",
"cert/x509_util_ios.h",
"cert/x509_util_ios_and_mac.cc",
"cert/x509_util_ios_and_mac.h",
"cert/x509_util_mac.cc",
"cert/x509_util_mac.h",
"cert/x509_util_nss.cc",
"cert/x509_util_nss.h",
"cert/x509_util_win.cc",
"cert/x509_util_win.h",
"cert_net/cert_net_fetcher_impl.cc",
"cert_net/cert_net_fetcher_impl.h",
"cert_net/nss_ocsp.cc",
......@@ -675,10 +595,8 @@ component("net") {
"disk_cache/blockfile/file.cc",
"disk_cache/blockfile/file.h",
"disk_cache/blockfile/file_block.h",
"disk_cache/blockfile/file_ios.cc",
"disk_cache/blockfile/file_lock.cc",
"disk_cache/blockfile/file_lock.h",
"disk_cache/blockfile/file_win.cc",
"disk_cache/blockfile/histogram_macros.h",
"disk_cache/blockfile/in_flight_backend_io.cc",
"disk_cache/blockfile/in_flight_backend_io.h",
......@@ -686,7 +604,6 @@ component("net") {
"disk_cache/blockfile/in_flight_io.h",
"disk_cache/blockfile/mapped_file.cc",
"disk_cache/blockfile/mapped_file.h",
"disk_cache/blockfile/mapped_file_win.cc",
"disk_cache/blockfile/rankings.cc",
"disk_cache/blockfile/rankings.h",
"disk_cache/blockfile/sparse_control.cc",
......@@ -700,7 +617,6 @@ component("net") {
"disk_cache/blockfile/trace.h",
"disk_cache/cache_util.cc",
"disk_cache/cache_util.h",
"disk_cache/cache_util_win.cc",
"disk_cache/disk_cache.cc",
"disk_cache/disk_cache.h",
"disk_cache/memory/mem_backend_impl.cc",
......@@ -727,14 +643,12 @@ component("net") {
"disk_cache/simple/simple_index_delegate.h",
"disk_cache/simple/simple_index_file.cc",
"disk_cache/simple/simple_index_file.h",
"disk_cache/simple/simple_index_file_win.cc",
"disk_cache/simple/simple_net_log_parameters.cc",
"disk_cache/simple/simple_net_log_parameters.h",
"disk_cache/simple/simple_synchronous_entry.cc",
"disk_cache/simple/simple_synchronous_entry.h",
"disk_cache/simple/simple_util.cc",
"disk_cache/simple/simple_util.h",
"disk_cache/simple/simple_util_win.cc",
"disk_cache/simple/simple_version_upgrade.cc",
"disk_cache/simple/simple_version_upgrade.h",
"filter/filter_source_stream.cc",
......@@ -779,13 +693,10 @@ component("net") {
"http/http_auth_handler_ntlm.cc",
"http/http_auth_handler_ntlm.h",
"http/http_auth_handler_ntlm_portable.cc",
"http/http_auth_handler_ntlm_win.cc",
"http/http_auth_multi_round_parse.cc",
"http/http_auth_multi_round_parse.h",
"http/http_auth_preferences.cc",
"http/http_auth_preferences.h",
"http/http_auth_sspi_win.cc",
"http/http_auth_sspi_win.h",
"http/http_basic_state.cc",
"http/http_basic_state.h",
"http/http_basic_stream.cc",
......@@ -849,7 +760,6 @@ component("net") {
"http/transport_security_persister.h",
"http/url_security_manager.cc",
"http/url_security_manager.h",
"http/url_security_manager_win.cc",
"http/webfonts_histogram.cc",
"http/webfonts_histogram.h",
"http2/platform/impl/http2_arraysize_impl.h",
......@@ -922,14 +832,8 @@ component("net") {
"ntlm/ntlm_client.h",
"ntlm/ntlm_constants.cc",
"ntlm/ntlm_constants.h",
"proxy_resolution/dhcp_pac_file_adapter_fetcher_win.cc",
"proxy_resolution/dhcp_pac_file_adapter_fetcher_win.h",
"proxy_resolution/dhcp_pac_file_fetcher.cc",
"proxy_resolution/dhcp_pac_file_fetcher.h",
"proxy_resolution/dhcp_pac_file_fetcher_win.cc",
"proxy_resolution/dhcp_pac_file_fetcher_win.h",
"proxy_resolution/dhcpcsvc_init_win.cc",
"proxy_resolution/dhcpcsvc_init_win.h",
"proxy_resolution/multi_threaded_proxy_resolver.cc",
"proxy_resolution/multi_threaded_proxy_resolver.h",
"proxy_resolution/network_delegate_error_observer.cc",
......@@ -951,18 +855,8 @@ component("net") {
"proxy_resolution/proxy_config.cc",
"proxy_resolution/proxy_config.h",
"proxy_resolution/proxy_config_service.h",
"proxy_resolution/proxy_config_service_android.cc",
"proxy_resolution/proxy_config_service_android.h",
"proxy_resolution/proxy_config_service_fixed.cc",
"proxy_resolution/proxy_config_service_fixed.h",
"proxy_resolution/proxy_config_service_ios.cc",
"proxy_resolution/proxy_config_service_ios.h",
"proxy_resolution/proxy_config_service_linux.cc",
"proxy_resolution/proxy_config_service_linux.h",
"proxy_resolution/proxy_config_service_mac.cc",
"proxy_resolution/proxy_config_service_mac.h",
"proxy_resolution/proxy_config_service_win.cc",
"proxy_resolution/proxy_config_service_win.h",
"proxy_resolution/proxy_config_with_annotation.cc",
"proxy_resolution/proxy_config_with_annotation.h",
"proxy_resolution/proxy_info.cc",
......@@ -976,10 +870,6 @@ component("net") {
"proxy_resolution/proxy_resolver_error_observer.h",
"proxy_resolution/proxy_resolver_factory.cc",
"proxy_resolution/proxy_resolver_factory.h",
"proxy_resolution/proxy_resolver_mac.cc",
"proxy_resolution/proxy_resolver_mac.h",
"proxy_resolution/proxy_resolver_winhttp.cc",
"proxy_resolution/proxy_resolver_winhttp.h",
"proxy_resolution/proxy_retry_info.h",
"quic/address_utils.h",
"quic/bidirectional_stream_quic_impl.cc",
......@@ -1119,8 +1009,6 @@ component("net") {
"socket/tcp_server_socket.cc",
"socket/tcp_server_socket.h",
"socket/tcp_socket.h",
"socket/tcp_socket_win.cc",
"socket/tcp_socket_win.h",
"socket/transport_client_socket.cc",
"socket/transport_client_socket.h",
"socket/transport_client_socket_pool.cc",
......@@ -1134,8 +1022,6 @@ component("net") {
"socket/udp_server_socket.cc",
"socket/udp_server_socket.h",
"socket/udp_socket.h",
"socket/udp_socket_win.cc",
"socket/udp_socket_win.h",
"socket/websocket_endpoint_lock_manager.cc",
"socket/websocket_endpoint_lock_manager.h",
"socket/websocket_transport_client_socket_pool.cc",
......@@ -1203,25 +1089,16 @@ component("net") {
"spdy/spdy_write_queue.cc",
"spdy/spdy_write_queue.h",
"ssl/client_cert_store.h",
"ssl/client_cert_store_mac.cc",
"ssl/client_cert_store_mac.h",
"ssl/client_cert_store_nss.cc",
"ssl/client_cert_store_nss.h",
"ssl/client_cert_store_win.cc",
"ssl/client_cert_store_win.h",
"ssl/ssl_config_service_defaults.cc",
"ssl/ssl_config_service_defaults.h",
"ssl/ssl_key_logger_impl.cc",
"ssl/ssl_key_logger_impl.h",
"ssl/ssl_platform_key_android.cc",
"ssl/ssl_platform_key_android.h",
"ssl/ssl_platform_key_mac.cc",
"ssl/ssl_platform_key_mac.h",
"ssl/ssl_platform_key_nss.cc",
"ssl/ssl_platform_key_nss.h",
"ssl/ssl_platform_key_util.cc",
"ssl/ssl_platform_key_util.h",
"ssl/ssl_platform_key_win.cc",
"ssl/threaded_ssl_private_key.cc",
"ssl/threaded_ssl_private_key.h",
"third_party/mozilla_security_manager/nsNSSCertificateDB.cpp",
......@@ -1902,6 +1779,160 @@ component("net") {
]
}
if (is_android) {
sources += [
"android/android_http_util.cc",
"android/cellular_signal_strength.cc",
"android/cellular_signal_strength.h",
"android/cert_verify_result_android.cc",
"android/cert_verify_result_android.h",
"android/gurl_utils.cc",
"android/http_auth_negotiate_android.cc",
"android/http_auth_negotiate_android.h",
"android/keystore.cc",
"android/keystore.h",
"android/network_change_notifier_android.cc",
"android/network_change_notifier_android.h",
"android/network_change_notifier_delegate_android.cc",
"android/network_change_notifier_delegate_android.h",
"android/network_change_notifier_factory_android.cc",
"android/network_change_notifier_factory_android.h",
"android/network_library.cc",
"android/network_library.h",
"android/traffic_stats.cc",
"android/traffic_stats.h",
"cert/cert_verify_proc_android.cc",
"cert/cert_verify_proc_android.h",
"cert/test_root_certs_android.cc",
"cert/x509_util_android.cc",
"proxy_resolution/proxy_config_service_android.cc",
"proxy_resolution/proxy_config_service_android.h",
"ssl/ssl_platform_key_android.cc",
"ssl/ssl_platform_key_android.h",
]
}
if (is_chromeos) {
sources += [
"cert/nss_cert_database_chromeos.cc",
"cert/nss_cert_database_chromeos.h",
"cert/nss_profile_filter_chromeos.cc",
"cert/nss_profile_filter_chromeos.h",
]
}
if (is_ios) {
sources += [
"cert/cert_verify_proc_ios.cc",
"cert/cert_verify_proc_ios.h",
"cert/x509_util_ios.cc",
"cert/x509_util_ios.h",
"disk_cache/blockfile/file_ios.cc",
"proxy_resolution/proxy_config_service_ios.cc",
"proxy_resolution/proxy_config_service_ios.h",
]
}
if (is_linux) {
sources += [
"base/address_tracker_linux.cc",
"base/address_tracker_linux.h",
"base/network_change_notifier_linux.cc",
"base/network_change_notifier_linux.h",
"base/network_interfaces_linux.cc",
"base/network_interfaces_linux.h",
"base/platform_mime_util_linux.cc",
"proxy_resolution/proxy_config_service_linux.cc",
"proxy_resolution/proxy_config_service_linux.h",
]
}
if (is_mac) {
sources += [
"base/network_change_notifier_mac.cc",
"base/network_change_notifier_mac.h",
"base/network_config_watcher_mac.cc",
"base/network_config_watcher_mac.h",
"base/network_notification_thread_mac.cc",
"base/network_notification_thread_mac.h",
"base/platform_mime_util_mac.mm",
"base/proxy_server_mac.cc",
"cert/cert_database_mac.cc",
"cert/cert_verify_proc_mac.cc",
"cert/cert_verify_proc_mac.h",
"cert/internal/trust_store_mac.cc",
"cert/internal/trust_store_mac.h",
"cert/known_roots_mac.cc",
"cert/known_roots_mac.h",
"cert/test_keychain_search_list_mac.cc",
"cert/test_keychain_search_list_mac.h",
"cert/test_root_certs_mac.cc",
"cert/x509_util_ios_and_mac.cc",
"cert/x509_util_ios_and_mac.h",
"cert/x509_util_mac.cc",
"cert/x509_util_mac.h",
"proxy_resolution/proxy_config_service_mac.cc",
"proxy_resolution/proxy_config_service_mac.h",
"proxy_resolution/proxy_resolver_mac.cc",
"proxy_resolution/proxy_resolver_mac.h",
"ssl/client_cert_identity_mac.cc",
"ssl/client_cert_identity_mac.h",
"ssl/client_cert_store_mac.cc",
"ssl/client_cert_store_mac.h",
"ssl/ssl_platform_key_mac.cc",
"ssl/ssl_platform_key_mac.h",
]
}
if (is_win) {
sources += [
"base/file_stream_context_win.cc",
"base/net_errors_win.cc",
"base/network_change_notifier_win.cc",
"base/network_change_notifier_win.h",
"base/network_interfaces_win.cc",
"base/network_interfaces_win.h",
"base/platform_mime_util_win.cc",
"base/winsock_init.cc",
"base/winsock_init.h",
"base/winsock_util.cc",
"base/winsock_util.h",
"cert/cert_verify_proc_win.cc",
"cert/cert_verify_proc_win.h",
"cert/known_roots_win.cc",
"cert/known_roots_win.h",
"cert/test_root_certs_win.cc",
"cert/x509_util_win.cc",
"cert/x509_util_win.h",
"disk_cache/blockfile/file_win.cc",
"disk_cache/blockfile/mapped_file_win.cc",
"disk_cache/cache_util_win.cc",
"disk_cache/simple/simple_index_file_win.cc",
"disk_cache/simple/simple_util_win.cc",
"http/http_auth_handler_ntlm_win.cc",
"http/http_auth_sspi_win.cc",
"http/http_auth_sspi_win.h",
"http/url_security_manager_win.cc",
"proxy_resolution/dhcp_pac_file_adapter_fetcher_win.cc",
"proxy_resolution/dhcp_pac_file_adapter_fetcher_win.h",
"proxy_resolution/dhcp_pac_file_fetcher_win.cc",
"proxy_resolution/dhcp_pac_file_fetcher_win.h",
"proxy_resolution/dhcpcsvc_init_win.cc",
"proxy_resolution/dhcpcsvc_init_win.h",
"proxy_resolution/proxy_config_service_win.cc",
"proxy_resolution/proxy_config_service_win.h",
"proxy_resolution/proxy_resolver_winhttp.cc",
"proxy_resolution/proxy_resolver_winhttp.h",
"socket/tcp_socket_win.cc",
"socket/tcp_socket_win.h",
"socket/udp_socket_win.cc",
"socket/udp_socket_win.h",
"ssl/client_cert_store_win.cc",
"ssl/client_cert_store_win.h",
"ssl/ssl_platform_key_win.cc",
]
}
if (!use_kerberos) {
sources -= [
"http/http_auth_handler_negotiate.cc",
......@@ -2029,23 +2060,10 @@ component("net") {
if (is_win) {
sources -= [ "http/http_auth_handler_ntlm_portable.cc" ]
} else { # !is_win
sources -= [
"base/winsock_init.cc",
"base/winsock_init.h",
"base/winsock_util.cc",
"base/winsock_util.h",
"proxy_resolution/proxy_resolver_winhttp.cc",
"proxy_resolution/proxy_resolver_winhttp.h",
]
}
if (is_ios) {
# Add back some sources that were otherwise filtered out.
# iOS needs some Mac files.
net_unfiltered_sources += [
"base/mac/url_conversions.h",
"base/mac/url_conversions.mm",
sources += [
"base/network_change_notifier_mac.cc",
"base/network_change_notifier_mac.h",
"base/network_config_watcher_mac.cc",
......@@ -2072,7 +2090,7 @@ component("net") {
if (is_android) {
# Add some Linux sources that were excluded by the filter, but which
# are needed.
net_unfiltered_sources += [
sources += [
"base/address_tracker_linux.cc",
"base/address_tracker_linux.h",
"base/network_interfaces_linux.cc",
......@@ -2109,11 +2127,6 @@ component("net") {
]
}
# Add back some sources that were otherwise filtered out.
set_sources_assignment_filter([])
sources += net_unfiltered_sources
set_sources_assignment_filter(sources_assignment_filter)
cflags = []
if (is_mac) {
......@@ -2824,8 +2837,6 @@ static_library("test_support") {
"test/gtest_util.h",
"test/key_util.cc",
"test/key_util.h",
"test/keychain_test_util_mac.cc",
"test/keychain_test_util_mac.h",
"test/net_test_suite.cc",
"test/net_test_suite.h",
"test/quic_simple_test_server.cc",
......@@ -2854,6 +2865,13 @@ static_library("test_support") {
"url_request/url_request_test_util.h",
]
if (is_mac) {
sources += [
"test/keychain_test_util_mac.cc",
"test/keychain_test_util_mac.h",
]
}
configs += [ "//build/config:precompiled_headers" ]
public_deps = [
......@@ -5070,16 +5088,8 @@ bundle_data("net_unittests_bundle_data") {
test("net_unittests") {
sources = [
"android/cellular_signal_strength_unittest.cc",
"android/dummy_spnego_authenticator.cc",
"android/dummy_spnego_authenticator.h",
"android/http_auth_negotiate_android_unittest.cc",
"android/network_change_notifier_android_unittest.cc",
"android/network_library_unittest.cc",
"android/traffic_stats_unittest.cc",
"base/address_family_unittest.cc",
"base/address_list_unittest.cc",
"base/address_tracker_linux_unittest.cc",
"base/backoff_entry_serializer_unittest.cc",
"base/backoff_entry_unittest.cc",
"base/chunked_upload_data_stream_unittest.cc",
......@@ -5105,10 +5115,7 @@ test("net_unittests") {
"base/net_string_util_unittest.cc",
"base/network_activity_monitor_unittest.cc",
"base/network_change_notifier_unittest.cc",
"base/network_change_notifier_win_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
"base/network_interfaces_unittest.cc",
"base/network_interfaces_win_unittest.cc",
"base/network_isolation_key_unittest.cc",
"base/parse_number_unittest.cc",
"base/port_util_unittest.cc",
......@@ -5125,10 +5132,7 @@ test("net_unittests") {
"base/url_util_unittest.cc",
"cert/caching_cert_verifier_unittest.cc",
"cert/cert_verifier_unittest.cc",
"cert/cert_verify_proc_android_unittest.cc",
"cert/cert_verify_proc_builtin_unittest.cc",
"cert/cert_verify_proc_ios_unittest.cc",
"cert/cert_verify_proc_mac_unittest.cc",
"cert/cert_verify_proc_unittest.cc",
"cert/coalescing_cert_verifier_unittest.cc",
"cert/crl_set_unittest.cc",
......@@ -5162,7 +5166,6 @@ test("net_unittests") {
"cert/internal/test_helpers.cc",
"cert/internal/test_helpers.h",
"cert/internal/trust_store_collection_unittest.cc",
"cert/internal/trust_store_mac_unittest.cc",
"cert/internal/trust_store_nss_unittest.cc",
"cert/internal/verify_certificate_chain_pkits_unittest.cc",
"cert/internal/verify_certificate_chain_typed_unittest.h",
......@@ -5175,16 +5178,13 @@ test("net_unittests") {
"cert/merkle_tree_leaf_unittest.cc",
"cert/multi_log_ct_verifier_unittest.cc",
"cert/multi_threaded_cert_verifier_unittest.cc",
"cert/nss_cert_database_chromeos_unittest.cc",
"cert/nss_cert_database_unittest.cc",
"cert/nss_profile_filter_chromeos_unittest.cc",
"cert/pem_tokenizer_unittest.cc",
"cert/signed_certificate_timestamp_unittest.cc",
"cert/symantec_certs_unittest.cc",
"cert/test_root_certs_unittest.cc",
"cert/x509_cert_types_unittest.cc",
"cert/x509_certificate_unittest.cc",
"cert/x509_util_ios_and_mac_unittest.cc",
"cert/x509_util_nss_unittest.cc",
"cert/x509_util_unittest.cc",
"cert_net/cert_net_fetcher_impl_unittest.cc",
......@@ -5246,7 +5246,6 @@ test("net_unittests") {
"http/http_auth_handler_unittest.cc",
"http/http_auth_multi_round_parse_unittest.cc",
"http/http_auth_preferences_unittest.cc",
"http/http_auth_sspi_win_unittest.cc",
"http/http_auth_unittest.cc",
"http/http_basic_state_unittest.cc",
"http/http_byte_range_unittest.cc",
......@@ -5276,8 +5275,6 @@ test("net_unittests") {
"http/http_vary_data_unittest.cc",
"http/mock_allow_http_auth_preferences.cc",
"http/mock_allow_http_auth_preferences.h",
"http/mock_sspi_library_win.cc",
"http/mock_sspi_library_win.h",
"http/transport_security_persister_unittest.cc",
"http/transport_security_state_unittest.cc",
"http/url_security_manager_unittest.cc",
......@@ -5307,17 +5304,12 @@ test("net_unittests") {
"ntlm/ntlm_client_unittest.cc",
"ntlm/ntlm_test_data.h",
"ntlm/ntlm_unittest.cc",
"proxy_resolution/dhcp_pac_file_adapter_fetcher_win_unittest.cc",
"proxy_resolution/dhcp_pac_file_fetcher_win_unittest.cc",
"proxy_resolution/multi_threaded_proxy_resolver_unittest.cc",
"proxy_resolution/network_delegate_error_observer_unittest.cc",
"proxy_resolution/pac_file_decider_unittest.cc",
"proxy_resolution/pac_file_fetcher_impl_unittest.cc",
"proxy_resolution/pac_library_unittest.cc",
"proxy_resolution/proxy_bypass_rules_unittest.cc",
"proxy_resolution/proxy_config_service_android_unittest.cc",
"proxy_resolution/proxy_config_service_linux_unittest.cc",
"proxy_resolution/proxy_config_service_win_unittest.cc",
"proxy_resolution/proxy_config_unittest.cc",
"proxy_resolution/proxy_info_unittest.cc",
"proxy_resolution/proxy_list_unittest.cc",
......@@ -5407,21 +5399,16 @@ test("net_unittests") {
"spdy/spdy_stream_unittest.cc",
"spdy/spdy_write_queue_unittest.cc",
"ssl/client_cert_identity_unittest.cc",
"ssl/client_cert_store_mac_unittest.cc",
"ssl/client_cert_store_nss_unittest.cc",
"ssl/client_cert_store_unittest-inl.h",
"ssl/client_cert_store_win_unittest.cc",
"ssl/ssl_cipher_suite_names_unittest.cc",
"ssl/ssl_client_auth_cache_unittest.cc",
"ssl/ssl_client_session_cache_unittest.cc",
"ssl/ssl_config_service_unittest.cc",
"ssl/ssl_config_unittest.cc",
"ssl/ssl_connection_status_flags_unittest.cc",
"ssl/ssl_platform_key_android_unittest.cc",
"ssl/ssl_platform_key_mac_unittest.cc",
"ssl/ssl_platform_key_nss_unittest.cc",
"ssl/ssl_platform_key_util_unittest.cc",
"ssl/ssl_platform_key_win_unittest.cc",
"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",
......@@ -5718,7 +5705,65 @@ test("net_unittests") {
"url_request/url_request_unittest.cc",
"url_request/view_cache_helper_unittest.cc",
]
net_unfiltered_sources = []
if (is_android) {
sources += [
"android/cellular_signal_strength_unittest.cc",
"android/dummy_spnego_authenticator.cc",
"android/dummy_spnego_authenticator.h",
"android/http_auth_negotiate_android_unittest.cc",
"android/network_change_notifier_android_unittest.cc",
"android/network_library_unittest.cc",
"android/traffic_stats_unittest.cc",
"cert/cert_verify_proc_android_unittest.cc",
"proxy_resolution/proxy_config_service_android_unittest.cc",
"ssl/ssl_platform_key_android_unittest.cc",
]
}
if (is_chromeos) {
sources += [
"cert/nss_cert_database_chromeos_unittest.cc",
"cert/nss_profile_filter_chromeos_unittest.cc",
]
}
if (is_ios) {
sources += [ "cert/cert_verify_proc_ios_unittest.cc" ]
}
if (is_linux) {
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
"proxy_resolution/proxy_config_service_linux_unittest.cc",
]
}
if (is_mac) {
sources += [
"cert/cert_verify_proc_mac_unittest.cc",
"cert/internal/trust_store_mac_unittest.cc",
"cert/x509_util_ios_and_mac_unittest.cc",
"ssl/client_cert_store_mac_unittest.cc",
"ssl/ssl_platform_key_mac_unittest.cc",
]
}
if (is_win) {
sources += [
"base/network_change_notifier_win_unittest.cc",
"base/network_interfaces_win_unittest.cc",
"http/http_auth_sspi_win_unittest.cc",
"http/mock_sspi_library_win.cc",
"http/mock_sspi_library_win.h",
"proxy_resolution/dhcp_pac_file_adapter_fetcher_win_unittest.cc",
"proxy_resolution/dhcp_pac_file_fetcher_win_unittest.cc",
"proxy_resolution/proxy_config_service_win_unittest.cc",
"ssl/client_cert_store_win_unittest.cc",
"ssl/ssl_platform_key_win_unittest.cc",
]
}
# Disable building Quartc tests on iOS as they appear to be flaky there.
if (!is_ios) {
......@@ -5771,7 +5816,6 @@ test("net_unittests") {
"third_party/quiche/src/quic/quartc/test/random_packet_filter.h",
]
}
configs += [ "//build/config:precompiled_headers" ]
defines = []
......@@ -6054,7 +6098,7 @@ test("net_unittests") {
"url_request/url_fetcher_impl_unittest.cc",
"url_request/url_request_context_builder_unittest.cc",
]
net_unfiltered_sources += [ "cert/x509_util_ios_and_mac_unittest.cc" ]
sources += [ "cert/x509_util_ios_and_mac_unittest.cc" ]
bundle_deps = [ ":net_unittests_bundle_data" ]
}
......@@ -6124,12 +6168,10 @@ test("net_unittests") {
"//v8:v8_external_startup_data_assets",
]
android_manifest = "//net/android/unittest_support/AndroidManifest.xml"
set_sources_assignment_filter([])
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
]
set_sources_assignment_filter(sources_assignment_filter)
shard_timeout = 300
}
......@@ -6158,11 +6200,6 @@ test("net_unittests") {
"//net/tools/transport_security_state_generator:transport_security_state_generator_test_sources",
]
}
# Add back some sources that were otherwise filtered out.
set_sources_assignment_filter([])
sources += net_unfiltered_sources
set_sources_assignment_filter(sources_assignment_filter)
}
# !is_android && !is_win && !is_mac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment