| 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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 757 ] | 757 ] |
| 758 } | 758 } |
| 759 | 759 |
| 760 if (use_v8_in_net) { | 760 if (use_v8_in_net) { |
| 761 component("net_with_v8") { | 761 component("net_with_v8") { |
| 762 sources = [ | 762 sources = [ |
| 763 "proxy/proxy_resolver_v8.cc", | 763 "proxy/proxy_resolver_v8.cc", |
| 764 "proxy/proxy_resolver_v8.h", | 764 "proxy/proxy_resolver_v8.h", |
| 765 "proxy/proxy_resolver_v8_tracing.cc", | 765 "proxy/proxy_resolver_v8_tracing.cc", |
| 766 "proxy/proxy_resolver_v8_tracing.h", | 766 "proxy/proxy_resolver_v8_tracing.h", |
| 767 "proxy/proxy_resolver_v8_tracing_wrapper.cc", |
| 768 "proxy/proxy_resolver_v8_tracing_wrapper.h", |
| 767 "proxy/proxy_service_v8.cc", | 769 "proxy/proxy_service_v8.cc", |
| 768 "proxy/proxy_service_v8.h", | 770 "proxy/proxy_service_v8.h", |
| 769 ] | 771 ] |
| 770 | 772 |
| 771 defines = [ "NET_IMPLEMENTATION" ] | 773 defines = [ "NET_IMPLEMENTATION" ] |
| 772 configs += [ | 774 configs += [ |
| 773 "//build/config/compiler:no_size_t_to_int_warning", | 775 "//build/config/compiler:no_size_t_to_int_warning", |
| 774 "//build/config/compiler:wexit_time_destructors", | 776 "//build/config/compiler:wexit_time_destructors", |
| 775 ] | 777 ] |
| 776 | 778 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 828 ":net", | 830 ":net", |
| 829 "//net/interfaces", | 831 "//net/interfaces", |
| 830 "//third_party/mojo/src/mojo/public/cpp/bindings", | 832 "//third_party/mojo/src/mojo/public/cpp/bindings", |
| 831 ] | 833 ] |
| 832 } | 834 } |
| 833 | 835 |
| 834 source_set("net_utility_services") { | 836 source_set("net_utility_services") { |
| 835 sources = [ | 837 sources = [ |
| 836 "dns/host_resolver_mojo.cc", | 838 "dns/host_resolver_mojo.cc", |
| 837 "dns/host_resolver_mojo.h", | 839 "dns/host_resolver_mojo.h", |
| 838 "proxy/load_state_change_coalescer.cc", | |
| 839 "proxy/load_state_change_coalescer.h", | |
| 840 "proxy/mojo_proxy_resolver_factory_impl.cc", | 840 "proxy/mojo_proxy_resolver_factory_impl.cc", |
| 841 "proxy/mojo_proxy_resolver_factory_impl.h", | 841 "proxy/mojo_proxy_resolver_factory_impl.h", |
| 842 "proxy/mojo_proxy_resolver_impl.cc", | 842 "proxy/mojo_proxy_resolver_impl.cc", |
| 843 "proxy/mojo_proxy_resolver_impl.h", | 843 "proxy/mojo_proxy_resolver_impl.h", |
| 844 "proxy/proxy_resolver_error_observer_mojo.cc", | 844 "proxy/proxy_resolver_error_observer_mojo.cc", |
| 845 "proxy/proxy_resolver_error_observer_mojo.h", | 845 "proxy/proxy_resolver_error_observer_mojo.h", |
| 846 ] | 846 ] |
| 847 | 847 |
| 848 deps = [ | 848 deps = [ |
| 849 ":net_with_v8", | 849 ":net_with_v8", |
| (...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1487 deps += [ | 1487 deps += [ |
| 1488 ":net_browser_services", | 1488 ":net_browser_services", |
| 1489 ":net_utility_services", | 1489 ":net_utility_services", |
| 1490 "//mojo/environment:chromium", | 1490 "//mojo/environment:chromium", |
| 1491 "//third_party/mojo/src/mojo/edk/system", | 1491 "//third_party/mojo/src/mojo/edk/system", |
| 1492 ] | 1492 ] |
| 1493 } else { | 1493 } else { |
| 1494 sources -= [ | 1494 sources -= [ |
| 1495 "dns/host_resolver_mojo_unittest.cc", | 1495 "dns/host_resolver_mojo_unittest.cc", |
| 1496 "dns/mojo_host_resolver_impl_unittest.cc", | 1496 "dns/mojo_host_resolver_impl_unittest.cc", |
| 1497 "proxy/load_state_change_coalescer_unittest.cc", | |
| 1498 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", | 1497 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", |
| 1499 "proxy/mojo_proxy_resolver_impl_unittest.cc", | 1498 "proxy/mojo_proxy_resolver_impl_unittest.cc", |
| 1500 "proxy/proxy_resolver_error_observer_mojo_unittest.cc", | 1499 "proxy/proxy_resolver_error_observer_mojo_unittest.cc", |
| 1501 "proxy/proxy_resolver_factory_mojo_unittest.cc", | 1500 "proxy/proxy_resolver_factory_mojo_unittest.cc", |
| 1502 "proxy/proxy_service_mojo_unittest.cc", | 1501 "proxy/proxy_service_mojo_unittest.cc", |
| 1503 ] | 1502 ] |
| 1504 } | 1503 } |
| 1505 | 1504 |
| 1506 if (!enable_mdns) { | 1505 if (!enable_mdns) { |
| 1507 sources -= [ | 1506 sources -= [ |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1621 } else { | 1620 } else { |
| 1622 sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 1621 sources -= [ "proxy/proxy_resolver_perftest.cc" ] |
| 1623 } | 1622 } |
| 1624 | 1623 |
| 1625 if (is_win && icu_use_data_file) { | 1624 if (is_win && icu_use_data_file) { |
| 1626 # This is needed to trigger the dll copy step on windows. | 1625 # This is needed to trigger the dll copy step on windows. |
| 1627 # TODO(mark): Specifying this here shouldn't be necessary. | 1626 # TODO(mark): Specifying this here shouldn't be necessary. |
| 1628 deps += [ "//third_party/icu:icudata" ] | 1627 deps += [ "//third_party/icu:icudata" ] |
| 1629 } | 1628 } |
| 1630 } | 1629 } |
| OLD | NEW |