| 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 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 source_set("net_utility_services") { | 832 source_set("net_utility_services") { |
| 833 sources = [ | 833 sources = [ |
| 834 "dns/host_resolver_mojo.cc", | 834 "dns/host_resolver_mojo.cc", |
| 835 "dns/host_resolver_mojo.h", | 835 "dns/host_resolver_mojo.h", |
| 836 "proxy/load_state_change_coalescer.cc", | 836 "proxy/load_state_change_coalescer.cc", |
| 837 "proxy/load_state_change_coalescer.h", | 837 "proxy/load_state_change_coalescer.h", |
| 838 "proxy/mojo_proxy_resolver_factory_impl.cc", | 838 "proxy/mojo_proxy_resolver_factory_impl.cc", |
| 839 "proxy/mojo_proxy_resolver_factory_impl.h", | 839 "proxy/mojo_proxy_resolver_factory_impl.h", |
| 840 "proxy/mojo_proxy_resolver_impl.cc", | 840 "proxy/mojo_proxy_resolver_impl.cc", |
| 841 "proxy/mojo_proxy_resolver_impl.h", | 841 "proxy/mojo_proxy_resolver_impl.h", |
| 842 "proxy/proxy_resolver_error_observer_mojo.cc", |
| 843 "proxy/proxy_resolver_error_observer_mojo.h", |
| 842 ] | 844 ] |
| 843 | 845 |
| 844 deps = [ | 846 deps = [ |
| 845 ":net_with_v8", | 847 ":net_with_v8", |
| 846 ] | 848 ] |
| 847 | 849 |
| 848 public_deps = [ | 850 public_deps = [ |
| 849 ":mojo_type_converters", | 851 ":mojo_type_converters", |
| 850 ":net", | 852 ":net", |
| 851 "//mojo/common", | 853 "//mojo/common", |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1486 "//mojo/environment:chromium", | 1488 "//mojo/environment:chromium", |
| 1487 "//third_party/mojo/src/mojo/edk/system", | 1489 "//third_party/mojo/src/mojo/edk/system", |
| 1488 ] | 1490 ] |
| 1489 } else { | 1491 } else { |
| 1490 sources -= [ | 1492 sources -= [ |
| 1491 "dns/host_resolver_mojo_unittest.cc", | 1493 "dns/host_resolver_mojo_unittest.cc", |
| 1492 "dns/mojo_host_resolver_impl_unittest.cc", | 1494 "dns/mojo_host_resolver_impl_unittest.cc", |
| 1493 "proxy/load_state_change_coalescer_unittest.cc", | 1495 "proxy/load_state_change_coalescer_unittest.cc", |
| 1494 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", | 1496 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", |
| 1495 "proxy/mojo_proxy_resolver_impl_unittest.cc", | 1497 "proxy/mojo_proxy_resolver_impl_unittest.cc", |
| 1498 "proxy/proxy_resolver_error_observer_mojo_unittest.cc", |
| 1496 "proxy/proxy_resolver_mojo_unittest.cc", | 1499 "proxy/proxy_resolver_mojo_unittest.cc", |
| 1497 "proxy/proxy_service_mojo_unittest.cc", | 1500 "proxy/proxy_service_mojo_unittest.cc", |
| 1498 ] | 1501 ] |
| 1499 } | 1502 } |
| 1500 | 1503 |
| 1501 if (!enable_mdns) { | 1504 if (!enable_mdns) { |
| 1502 sources -= [ | 1505 sources -= [ |
| 1503 "dns/mdns_cache_unittest.cc", | 1506 "dns/mdns_cache_unittest.cc", |
| 1504 "dns/mdns_client_unittest.cc", | 1507 "dns/mdns_client_unittest.cc", |
| 1505 "dns/record_parsed_unittest.cc", | 1508 "dns/record_parsed_unittest.cc", |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1615 } else { | 1618 } else { |
| 1616 sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 1619 sources -= [ "proxy/proxy_resolver_perftest.cc" ] |
| 1617 } | 1620 } |
| 1618 | 1621 |
| 1619 if (is_win && icu_use_data_file) { | 1622 if (is_win && icu_use_data_file) { |
| 1620 # This is needed to trigger the dll copy step on windows. | 1623 # This is needed to trigger the dll copy step on windows. |
| 1621 # TODO(mark): Specifying this here shouldn't be necessary. | 1624 # TODO(mark): Specifying this here shouldn't be necessary. |
| 1622 deps += [ "//third_party/icu:icudata" ] | 1625 deps += [ "//third_party/icu:icudata" ] |
| 1623 } | 1626 } |
| 1624 } | 1627 } |
| OLD | NEW |