| OLD | NEW |
| 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 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 "//v8", | 697 "//v8", |
| 698 ] | 698 ] |
| 699 } | 699 } |
| 700 } | 700 } |
| 701 | 701 |
| 702 if (use_v8_in_net && !is_android) { | 702 if (use_v8_in_net && !is_android) { |
| 703 source_set("net_browser_services") { | 703 source_set("net_browser_services") { |
| 704 sources = [ | 704 sources = [ |
| 705 "dns/mojo_host_resolver_impl.cc", | 705 "dns/mojo_host_resolver_impl.cc", |
| 706 "dns/mojo_host_resolver_impl.h", | 706 "dns/mojo_host_resolver_impl.h", |
| 707 "proxy/in_process_mojo_proxy_resolver_factory.cc", | |
| 708 "proxy/in_process_mojo_proxy_resolver_factory.h", | |
| 709 "proxy/mojo_proxy_resolver_factory.h", | 707 "proxy/mojo_proxy_resolver_factory.h", |
| 710 "proxy/proxy_resolver_factory_mojo.cc", | 708 "proxy/proxy_resolver_factory_mojo.cc", |
| 711 "proxy/proxy_resolver_factory_mojo.h", | 709 "proxy/proxy_resolver_factory_mojo.h", |
| 712 "proxy/proxy_service_mojo.cc", | 710 "proxy/proxy_service_mojo.cc", |
| 713 "proxy/proxy_service_mojo.h", | 711 "proxy/proxy_service_mojo.h", |
| 714 ] | 712 ] |
| 715 | 713 |
| 716 public_deps = [ | 714 public_deps = [ |
| 717 ":net_with_v8", | 715 ":net_with_v8", |
| 718 "//base", | 716 "//base", |
| 719 "//mojo/public/cpp/bindings", | 717 "//mojo/public/cpp/bindings", |
| 720 "//net/interfaces", | 718 "//net/interfaces", |
| 721 | |
| 722 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we need | |
| 723 # this dependency since in_process_mojo_proxy_resolver_factory creates | |
| 724 # the utility process side Mojo services in the browser process. | |
| 725 # Ultimately, this will go away when we only support out-of-process. | |
| 726 ":net_utility_services", | |
| 727 ] | 719 ] |
| 728 } | 720 } |
| 729 | 721 |
| 730 source_set("net_utility_services") { | 722 source_set("net_utility_services") { |
| 731 sources = [ | 723 sources = [ |
| 732 "dns/host_resolver_mojo.cc", | 724 "dns/host_resolver_mojo.cc", |
| 733 "dns/host_resolver_mojo.h", | 725 "dns/host_resolver_mojo.h", |
| 734 "proxy/mojo_proxy_resolver_factory_impl.cc", | 726 "proxy/mojo_proxy_resolver_factory_impl.cc", |
| 735 "proxy/mojo_proxy_resolver_factory_impl.h", | 727 "proxy/mojo_proxy_resolver_factory_impl.h", |
| 736 "proxy/mojo_proxy_resolver_impl.cc", | 728 "proxy/mojo_proxy_resolver_impl.cc", |
| (...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2091 if (host_toolchain == current_toolchain) { | 2083 if (host_toolchain == current_toolchain) { |
| 2092 executable("domain_security_preload_generator") { | 2084 executable("domain_security_preload_generator") { |
| 2093 sources = gypi_values.net_domain_security_state_generator_sources | 2085 sources = gypi_values.net_domain_security_state_generator_sources |
| 2094 deps = [ | 2086 deps = [ |
| 2095 "//base", | 2087 "//base", |
| 2096 "//crypto", | 2088 "//crypto", |
| 2097 "//third_party/boringssl", | 2089 "//third_party/boringssl", |
| 2098 ] | 2090 ] |
| 2099 } | 2091 } |
| 2100 } | 2092 } |
| OLD | NEW |