| 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/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//build/module_args/v8.gni") | 8 import("//build/module_args/v8.gni") |
| 9 import("//url/config.gni") | 9 import("//url/config.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 782 "//v8", | 782 "//v8", |
| 783 ] | 783 ] |
| 784 } | 784 } |
| 785 } | 785 } |
| 786 | 786 |
| 787 if (use_v8_in_net && !is_android) { | 787 if (use_v8_in_net && !is_android) { |
| 788 source_set("net_browser_services") { | 788 source_set("net_browser_services") { |
| 789 sources = [ | 789 sources = [ |
| 790 "dns/mojo_host_resolver_impl.cc", | 790 "dns/mojo_host_resolver_impl.cc", |
| 791 "dns/mojo_host_resolver_impl.h", | 791 "dns/mojo_host_resolver_impl.h", |
| 792 "proxy/in_process_mojo_proxy_resolver_factory.cc", | |
| 793 "proxy/in_process_mojo_proxy_resolver_factory.h", | |
| 794 "proxy/proxy_resolver_mojo.cc", | 792 "proxy/proxy_resolver_mojo.cc", |
| 795 "proxy/proxy_resolver_mojo.h", | 793 "proxy/proxy_resolver_mojo.h", |
| 796 "proxy/proxy_service_mojo.cc", | 794 "proxy/proxy_service_mojo.cc", |
| 797 "proxy/proxy_service_mojo.h", | 795 "proxy/proxy_service_mojo.h", |
| 798 ] | 796 ] |
| 799 | 797 |
| 800 public_deps = [ | 798 public_deps = [ |
| 801 ":mojo_type_converters", | 799 ":mojo_type_converters", |
| 802 ":net", | 800 ":net", |
| 803 "//base", | 801 "//base", |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1615 } else { | 1613 } else { |
| 1616 sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 1614 sources -= [ "proxy/proxy_resolver_perftest.cc" ] |
| 1617 } | 1615 } |
| 1618 | 1616 |
| 1619 if (is_win && icu_use_data_file) { | 1617 if (is_win && icu_use_data_file) { |
| 1620 # This is needed to trigger the dll copy step on windows. | 1618 # This is needed to trigger the dll copy step on windows. |
| 1621 # TODO(mark): Specifying this here shouldn't be necessary. | 1619 # TODO(mark): Specifying this here shouldn't be necessary. |
| 1622 deps += [ "//third_party/icu:icudata" ] | 1620 deps += [ "//third_party/icu:icudata" ] |
| 1623 } | 1621 } |
| 1624 } | 1622 } |
| OLD | NEW |