Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Side by Side Diff: net/BUILD.gn

Issue 2881613002: Allow use of Mojo/V8 ProxyResolvers with URLRequestContextBuilder. (Closed)
Patch Set: Forgot to remove WaitForConnectionsListener Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/chromecast_build.gni") 6 import("//build/config/chromecast_build.gni")
7 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/crypto.gni") 8 import("//build/config/crypto.gni")
9 import("//build/config/features.gni") 9 import("//build/config/features.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 18 matching lines...) Expand all
29 29
30 # The way the cache uses mmap() is inefficient on some Android devices. If 30 # The way the cache uses mmap() is inefficient on some Android devices. If
31 # this flag is set, we hackily avoid using mmap() in the disk cache. We are 31 # this flag is set, we hackily avoid using mmap() in the disk cache. We are
32 # pretty confident that mmap-ing the index would not hurt any existing x86 32 # pretty confident that mmap-ing the index would not hurt any existing x86
33 # android devices, but we cannot be so sure about the variety of ARM devices. 33 # android devices, but we cannot be so sure about the variety of ARM devices.
34 # So enable it for x86 only for now. 34 # So enable it for x86 only for now.
35 posix_avoid_mmap = is_android && current_cpu != "x86" 35 posix_avoid_mmap = is_android && current_cpu != "x86"
36 36
37 use_v8_in_net = !is_ios && !is_proto_quic 37 use_v8_in_net = !is_ios && !is_proto_quic
38 enable_built_in_dns = !is_ios && !is_proto_quic 38 enable_built_in_dns = !is_ios && !is_proto_quic
39 enable_mojo = !is_ios && !is_android && !is_proto_quic
39 40
40 # True if certificates are represented with DER byte buffers. This can be true 41 # True if certificates are represented with DER byte buffers. This can be true
41 # in addition to use_openssl_certs or use_nss_certs, in that case byte certs 42 # in addition to use_openssl_certs or use_nss_certs, in that case byte certs
42 # are used internally but OpenSSL or NSS are used for certificate verification. 43 # are used internally but OpenSSL or NSS are used for certificate verification.
43 # TODO(mattm): crbug.com/671420: Implement and enable this for all platforms. 44 # TODO(mattm): crbug.com/671420: Implement and enable this for all platforms.
44 use_byte_certs = is_mac || is_android || is_nacl 45 use_byte_certs = is_mac || is_android || is_nacl
45 46
46 buildflag_header("features") { 47 buildflag_header("features") {
47 header = "net_features.h" 48 header = "net_features.h"
48 flags = [ 49 flags = [
(...skipping 2431 matching lines...) Expand 10 before | Expand all | Expand 10 after
2480 "test/embedded_test_server/embedded_test_server.h", 2481 "test/embedded_test_server/embedded_test_server.h",
2481 "test/embedded_test_server/embedded_test_server_connection_listener.h", 2482 "test/embedded_test_server/embedded_test_server_connection_listener.h",
2482 "test/embedded_test_server/http_connection.cc", 2483 "test/embedded_test_server/http_connection.cc",
2483 "test/embedded_test_server/http_connection.h", 2484 "test/embedded_test_server/http_connection.h",
2484 "test/embedded_test_server/http_request.cc", 2485 "test/embedded_test_server/http_request.cc",
2485 "test/embedded_test_server/http_request.h", 2486 "test/embedded_test_server/http_request.h",
2486 "test/embedded_test_server/http_response.cc", 2487 "test/embedded_test_server/http_response.cc",
2487 "test/embedded_test_server/http_response.h", 2488 "test/embedded_test_server/http_response.h",
2488 "test/embedded_test_server/request_handler_util.cc", 2489 "test/embedded_test_server/request_handler_util.cc",
2489 "test/embedded_test_server/request_handler_util.h", 2490 "test/embedded_test_server/request_handler_util.h",
2491 "test/embedded_test_server/simple_connection_listener.cc",
2492 "test/embedded_test_server/simple_connection_listener.h",
2490 "test/event_waiter.h", 2493 "test/event_waiter.h",
2491 "test/gtest_util.h", 2494 "test/gtest_util.h",
2492 "test/net_test_suite.cc", 2495 "test/net_test_suite.cc",
2493 "test/net_test_suite.h", 2496 "test/net_test_suite.h",
2494 "test/python_utils.cc", 2497 "test/python_utils.cc",
2495 "test/python_utils.h", 2498 "test/python_utils.h",
2496 "test/scoped_disable_exit_on_dfatal.cc", 2499 "test/scoped_disable_exit_on_dfatal.cc",
2497 "test/scoped_disable_exit_on_dfatal.h", 2500 "test/scoped_disable_exit_on_dfatal.h",
2498 "test/test_certificate_data.h", 2501 "test/test_certificate_data.h",
2499 "test/test_data_directory.cc", 2502 "test/test_data_directory.cc",
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2622 ] 2625 ]
2623 deps = [ 2626 deps = [
2624 "//base", 2627 "//base",
2625 "//gin", 2628 "//gin",
2626 "//url", 2629 "//url",
2627 "//v8", 2630 "//v8",
2628 ] 2631 ]
2629 } 2632 }
2630 } 2633 }
2631 2634
2632 if (!is_ios && !is_android && !is_proto_quic) { 2635 if (enable_mojo) {
2633 source_set("net_browser_services") { 2636 source_set("net_browser_services") {
2634 sources = [ 2637 sources = [
2635 "dns/mojo_host_resolver_impl.cc", 2638 "dns/mojo_host_resolver_impl.cc",
2636 "dns/mojo_host_resolver_impl.h", 2639 "dns/mojo_host_resolver_impl.h",
2637 "proxy/mojo_proxy_resolver_factory.h", 2640 "proxy/mojo_proxy_resolver_factory.h",
2638 "proxy/proxy_resolver_factory_mojo.cc", 2641 "proxy/proxy_resolver_factory_mojo.cc",
2639 "proxy/proxy_resolver_factory_mojo.h", 2642 "proxy/proxy_resolver_factory_mojo.h",
2640 "proxy/proxy_service_mojo.cc", 2643 "proxy/proxy_service_mojo.cc",
2641 "proxy/proxy_service_mojo.h", 2644 "proxy/proxy_service_mojo.h",
2642 ] 2645 ]
(...skipping 23 matching lines...) Expand all
2666 ] 2669 ]
2667 2670
2668 public_deps = [ 2671 public_deps = [
2669 ":net", 2672 ":net",
2670 "//mojo/public/cpp/bindings", 2673 "//mojo/public/cpp/bindings",
2671 "//net/interfaces", 2674 "//net/interfaces",
2672 ] 2675 ]
2673 } 2676 }
2674 } 2677 }
2675 2678
2679 if (use_v8_in_net) {
2680 source_set("net_context_builder_with_v8") {
2681 sources = [
2682 "url_request/url_request_context_builder_v8.cc",
2683 "url_request/url_request_context_builder_v8.h",
2684 ]
2685
2686 defines = []
2687
2688 deps = [
2689 ":net",
2690 ":net_with_v8",
2691 "//base",
2692 ]
2693
2694 if (enable_mojo) {
2695 deps += [
2696 ":net_browser_services",
2697 "//mojo/public/cpp/bindings",
2698 "//net/interfaces",
2699 ]
2700
2701 defines += [ "ENABLE_MOJO" ]
2702 }
2703 }
2704 }
2705
2676 if (!is_ios && !is_android) { 2706 if (!is_ios && !is_android) {
2677 executable("cert_verify_tool") { 2707 executable("cert_verify_tool") {
2678 testonly = true 2708 testonly = true
2679 sources = [ 2709 sources = [
2680 "tools/cert_verify_tool/cert_verify_tool.cc", 2710 "tools/cert_verify_tool/cert_verify_tool.cc",
2681 "tools/cert_verify_tool/cert_verify_tool_util.cc", 2711 "tools/cert_verify_tool/cert_verify_tool_util.cc",
2682 "tools/cert_verify_tool/cert_verify_tool_util.h", 2712 "tools/cert_verify_tool/cert_verify_tool_util.h",
2683 "tools/cert_verify_tool/verify_using_cert_verify_proc.cc", 2713 "tools/cert_verify_tool/verify_using_cert_verify_proc.cc",
2684 "tools/cert_verify_tool/verify_using_cert_verify_proc.h", 2714 "tools/cert_verify_tool/verify_using_cert_verify_proc.h",
2685 "tools/cert_verify_tool/verify_using_path_builder.cc", 2715 "tools/cert_verify_tool/verify_using_path_builder.cc",
(...skipping 1852 matching lines...) Expand 10 before | Expand all | Expand 10 after
4538 "proxy/proxy_list_unittest.cc", 4568 "proxy/proxy_list_unittest.cc",
4539 "proxy/proxy_resolver_factory_mojo_unittest.cc", 4569 "proxy/proxy_resolver_factory_mojo_unittest.cc",
4540 "proxy/proxy_resolver_v8_tracing_unittest.cc", 4570 "proxy/proxy_resolver_v8_tracing_unittest.cc",
4541 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc", 4571 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc",
4542 "proxy/proxy_resolver_v8_unittest.cc", 4572 "proxy/proxy_resolver_v8_unittest.cc",
4543 "proxy/proxy_script_decider_unittest.cc", 4573 "proxy/proxy_script_decider_unittest.cc",
4544 "proxy/proxy_script_fetcher_impl_unittest.cc", 4574 "proxy/proxy_script_fetcher_impl_unittest.cc",
4545 "proxy/proxy_server_unittest.cc", 4575 "proxy/proxy_server_unittest.cc",
4546 "proxy/proxy_service_mojo_unittest.cc", 4576 "proxy/proxy_service_mojo_unittest.cc",
4547 "proxy/proxy_service_unittest.cc", 4577 "proxy/proxy_service_unittest.cc",
4578 "proxy/test_mojo_proxy_resolver_factory.cc",
4579 "proxy/test_mojo_proxy_resolver_factory.h",
4548 "quic/chromium/bidirectional_stream_quic_impl_unittest.cc", 4580 "quic/chromium/bidirectional_stream_quic_impl_unittest.cc",
4549 "quic/chromium/crypto/proof_test_chromium.cc", 4581 "quic/chromium/crypto/proof_test_chromium.cc",
4550 "quic/chromium/crypto/proof_verifier_chromium_test.cc", 4582 "quic/chromium/crypto/proof_verifier_chromium_test.cc",
4551 "quic/chromium/crypto_test_utils_chromium.cc", 4583 "quic/chromium/crypto_test_utils_chromium.cc",
4552 "quic/chromium/mock_crypto_client_stream_factory.cc", 4584 "quic/chromium/mock_crypto_client_stream_factory.cc",
4553 "quic/chromium/mock_crypto_client_stream_factory.h", 4585 "quic/chromium/mock_crypto_client_stream_factory.h",
4554 "quic/chromium/mock_quic_data.cc", 4586 "quic/chromium/mock_quic_data.cc",
4555 "quic/chromium/mock_quic_data.h", 4587 "quic/chromium/mock_quic_data.h",
4556 "quic/chromium/network_connection_unittest.cc", 4588 "quic/chromium/network_connection_unittest.cc",
4557 "quic/chromium/properties_based_quic_server_info_test.cc", 4589 "quic/chromium/properties_based_quic_server_info_test.cc",
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
4873 "tools/content_decoder_tool/content_decoder_tool_unittest.cc", 4905 "tools/content_decoder_tool/content_decoder_tool_unittest.cc",
4874 "tools/quic/quic_simple_client_test.cc", 4906 "tools/quic/quic_simple_client_test.cc",
4875 "tools/quic/test_tools/mock_quic_session_visitor.cc", 4907 "tools/quic/test_tools/mock_quic_session_visitor.cc",
4876 "tools/quic/test_tools/mock_quic_session_visitor.h", 4908 "tools/quic/test_tools/mock_quic_session_visitor.h",
4877 "tools/tld_cleanup/tld_cleanup_util_unittest.cc", 4909 "tools/tld_cleanup/tld_cleanup_util_unittest.cc",
4878 "url_request/report_sender_unittest.cc", 4910 "url_request/report_sender_unittest.cc",
4879 "url_request/sdch_dictionary_fetcher_unittest.cc", 4911 "url_request/sdch_dictionary_fetcher_unittest.cc",
4880 "url_request/url_fetcher_impl_unittest.cc", 4912 "url_request/url_fetcher_impl_unittest.cc",
4881 "url_request/url_fetcher_response_writer_unittest.cc", 4913 "url_request/url_fetcher_response_writer_unittest.cc",
4882 "url_request/url_request_context_builder_unittest.cc", 4914 "url_request/url_request_context_builder_unittest.cc",
4915 "url_request/url_request_context_builder_v8_unittest.cc",
4883 "url_request/url_request_context_unittest.cc", 4916 "url_request/url_request_context_unittest.cc",
4884 "url_request/url_request_data_job_unittest.cc", 4917 "url_request/url_request_data_job_unittest.cc",
4885 "url_request/url_request_file_dir_job_unittest.cc", 4918 "url_request/url_request_file_dir_job_unittest.cc",
4886 "url_request/url_request_file_job_unittest.cc", 4919 "url_request/url_request_file_job_unittest.cc",
4887 "url_request/url_request_filter_unittest.cc", 4920 "url_request/url_request_filter_unittest.cc",
4888 "url_request/url_request_ftp_job_unittest.cc", 4921 "url_request/url_request_ftp_job_unittest.cc",
4889 "url_request/url_request_http_job_unittest.cc", 4922 "url_request/url_request_http_job_unittest.cc",
4890 "url_request/url_request_job_factory_impl_unittest.cc", 4923 "url_request/url_request_job_factory_impl_unittest.cc",
4891 "url_request/url_request_job_unittest.cc", 4924 "url_request/url_request_job_unittest.cc",
4892 "url_request/url_request_quic_unittest.cc", 4925 "url_request/url_request_quic_unittest.cc",
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
5131 } 5164 }
5132 5165
5133 if (!enable_built_in_dns) { 5166 if (!enable_built_in_dns) {
5134 sources -= [ 5167 sources -= [
5135 "dns/address_sorter_posix_unittest.cc", 5168 "dns/address_sorter_posix_unittest.cc",
5136 "dns/address_sorter_unittest.cc", 5169 "dns/address_sorter_unittest.cc",
5137 ] 5170 ]
5138 } 5171 }
5139 5172
5140 if (use_v8_in_net) { 5173 if (use_v8_in_net) {
5141 deps += [ ":net_with_v8" ] 5174 deps += [
5175 ":net_context_builder_with_v8",
5176 ":net_with_v8",
5177 ]
5142 } else { 5178 } else {
5143 sources -= [ 5179 sources -= [
5144 "proxy/proxy_resolver_v8_tracing_unittest.cc", 5180 "proxy/proxy_resolver_v8_tracing_unittest.cc",
5145 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc", 5181 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc",
5146 "proxy/proxy_resolver_v8_unittest.cc", 5182 "proxy/proxy_resolver_v8_unittest.cc",
5183 "url_request/url_request_context_builder_v8_unittest.cc",
5147 ] 5184 ]
5148 } 5185 }
5149 5186
5150 if (use_v8_in_net && !is_android) { 5187 if (enable_mojo) {
5151 deps += [ 5188 deps += [
5152 ":net_browser_services", 5189 ":net_browser_services",
5153 ":net_utility_services", 5190 ":net_utility_services",
5154 "//mojo/edk/system", 5191 "//mojo/edk/system",
5155 ] 5192 ]
5193
5194 defines += [ "ENABLE_MOJO" ]
5156 } else { 5195 } else {
5157 sources -= [ 5196 sources -= [
5158 "dns/host_resolver_mojo_unittest.cc", 5197 "dns/host_resolver_mojo_unittest.cc",
5159 "dns/mojo_host_resolver_impl_unittest.cc", 5198 "dns/mojo_host_resolver_impl_unittest.cc",
5160 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", 5199 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc",
5161 "proxy/mojo_proxy_resolver_impl_unittest.cc", 5200 "proxy/mojo_proxy_resolver_impl_unittest.cc",
5162 "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc", 5201 "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc",
5163 "proxy/proxy_resolver_factory_mojo_unittest.cc", 5202 "proxy/proxy_resolver_factory_mojo_unittest.cc",
5164 "proxy/proxy_service_mojo_unittest.cc", 5203 "proxy/proxy_service_mojo_unittest.cc",
5204 "proxy/test_mojo_proxy_resolver_factory.cc",
5205 "proxy/test_mojo_proxy_resolver_factory.h",
5165 ] 5206 ]
5166 } 5207 }
5167 5208
5168 if (!enable_mdns) { 5209 if (!enable_mdns) {
5169 sources -= [ 5210 sources -= [
5170 "dns/mdns_cache_unittest.cc", 5211 "dns/mdns_cache_unittest.cc",
5171 "dns/mdns_client_unittest.cc", 5212 "dns/mdns_client_unittest.cc",
5172 ] 5213 ]
5173 } 5214 }
5174 5215
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
5873 ] 5914 ]
5874 deps = [ 5915 deps = [
5875 ":net_fuzzer_test_support", 5916 ":net_fuzzer_test_support",
5876 ":test_support", 5917 ":test_support",
5877 "//base", 5918 "//base",
5878 "//net", 5919 "//net",
5879 ] 5920 ]
5880 dict = "data/fuzzer_dictionaries/net_spdy_session_fuzzer.dict" 5921 dict = "data/fuzzer_dictionaries/net_spdy_session_fuzzer.dict"
5881 seed_corpus = "data/fuzzer_data/net_spdy_session_fuzzer/" 5922 seed_corpus = "data/fuzzer_data/net_spdy_session_fuzzer/"
5882 } 5923 }
OLDNEW
« no previous file with comments | « no previous file | net/proxy/proxy_script_fetcher_impl_unittest.cc » ('j') | net/proxy/test_mojo_proxy_resolver_factory.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698