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

Side by Side Diff: net/BUILD.gn

Issue 1145153004: Split ProxyResolverV8Tracing into an implementation and a wrapper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | net/interfaces/proxy_resolver_service.mojom » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 ] 761 ]
762 } 762 }
763 763
764 if (use_v8_in_net) { 764 if (use_v8_in_net) {
765 component("net_with_v8") { 765 component("net_with_v8") {
766 sources = [ 766 sources = [
767 "proxy/proxy_resolver_v8.cc", 767 "proxy/proxy_resolver_v8.cc",
768 "proxy/proxy_resolver_v8.h", 768 "proxy/proxy_resolver_v8.h",
769 "proxy/proxy_resolver_v8_tracing.cc", 769 "proxy/proxy_resolver_v8_tracing.cc",
770 "proxy/proxy_resolver_v8_tracing.h", 770 "proxy/proxy_resolver_v8_tracing.h",
771 "proxy/proxy_resolver_v8_tracing_wrapper.cc",
772 "proxy/proxy_resolver_v8_tracing_wrapper.h",
771 "proxy/proxy_service_v8.cc", 773 "proxy/proxy_service_v8.cc",
772 "proxy/proxy_service_v8.h", 774 "proxy/proxy_service_v8.h",
773 ] 775 ]
774 776
775 defines = [ "NET_IMPLEMENTATION" ] 777 defines = [ "NET_IMPLEMENTATION" ]
776 configs += [ 778 configs += [
777 "//build/config/compiler:no_size_t_to_int_warning", 779 "//build/config/compiler:no_size_t_to_int_warning",
778 "//build/config/compiler:wexit_time_destructors", 780 "//build/config/compiler:wexit_time_destructors",
779 ] 781 ]
780 782
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 ":net", 834 ":net",
833 "//net/interfaces", 835 "//net/interfaces",
834 "//third_party/mojo/src/mojo/public/cpp/bindings", 836 "//third_party/mojo/src/mojo/public/cpp/bindings",
835 ] 837 ]
836 } 838 }
837 839
838 source_set("net_utility_services") { 840 source_set("net_utility_services") {
839 sources = [ 841 sources = [
840 "dns/host_resolver_mojo.cc", 842 "dns/host_resolver_mojo.cc",
841 "dns/host_resolver_mojo.h", 843 "dns/host_resolver_mojo.h",
842 "proxy/load_state_change_coalescer.cc",
843 "proxy/load_state_change_coalescer.h",
844 "proxy/mojo_proxy_resolver_factory_impl.cc", 844 "proxy/mojo_proxy_resolver_factory_impl.cc",
845 "proxy/mojo_proxy_resolver_factory_impl.h", 845 "proxy/mojo_proxy_resolver_factory_impl.h",
846 "proxy/mojo_proxy_resolver_impl.cc", 846 "proxy/mojo_proxy_resolver_impl.cc",
847 "proxy/mojo_proxy_resolver_impl.h", 847 "proxy/mojo_proxy_resolver_impl.h",
848 "proxy/proxy_resolver_error_observer_mojo.cc", 848 "proxy/proxy_resolver_error_observer_mojo.cc",
849 "proxy/proxy_resolver_error_observer_mojo.h", 849 "proxy/proxy_resolver_error_observer_mojo.h",
850 ] 850 ]
851 851
852 deps = [ 852 deps = [
853 ":net_with_v8", 853 ":net_with_v8",
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1474 } 1474 }
1475 1475
1476 # Always need use_v8_in_net to be 1 to run on Android, so just remove 1476 # Always need use_v8_in_net to be 1 to run on Android, so just remove
1477 # net_unittest's dependency on v8 when using icu alternatives instead of 1477 # net_unittest's dependency on v8 when using icu alternatives instead of
1478 # setting use_v8_in_net to 0. 1478 # setting use_v8_in_net to 0.
1479 if (use_v8_in_net && !use_icu_alternatives_on_android) { 1479 if (use_v8_in_net && !use_icu_alternatives_on_android) {
1480 deps += [ ":net_with_v8" ] 1480 deps += [ ":net_with_v8" ]
1481 } else { 1481 } else {
1482 sources -= [ 1482 sources -= [
1483 "proxy/proxy_resolver_v8_tracing_unittest.cc", 1483 "proxy/proxy_resolver_v8_tracing_unittest.cc",
1484 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc",
1484 "proxy/proxy_resolver_v8_unittest.cc", 1485 "proxy/proxy_resolver_v8_unittest.cc",
1485 ] 1486 ]
1486 } 1487 }
1487 1488
1488 if (use_v8_in_net && !is_android) { 1489 if (use_v8_in_net && !is_android) {
1489 deps += [ 1490 deps += [
1490 ":net_browser_services", 1491 ":net_browser_services",
1491 ":net_utility_services", 1492 ":net_utility_services",
1492 "//mojo/environment:chromium", 1493 "//mojo/environment:chromium",
1493 "//third_party/mojo/src/mojo/edk/system", 1494 "//third_party/mojo/src/mojo/edk/system",
1494 ] 1495 ]
1495 } else { 1496 } else {
1496 sources -= [ 1497 sources -= [
1497 "dns/host_resolver_mojo_unittest.cc", 1498 "dns/host_resolver_mojo_unittest.cc",
1498 "dns/mojo_host_resolver_impl_unittest.cc", 1499 "dns/mojo_host_resolver_impl_unittest.cc",
1499 "proxy/load_state_change_coalescer_unittest.cc",
1500 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", 1500 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc",
1501 "proxy/mojo_proxy_resolver_impl_unittest.cc", 1501 "proxy/mojo_proxy_resolver_impl_unittest.cc",
1502 "proxy/proxy_resolver_error_observer_mojo_unittest.cc", 1502 "proxy/proxy_resolver_error_observer_mojo_unittest.cc",
1503 "proxy/proxy_resolver_factory_mojo_unittest.cc", 1503 "proxy/proxy_resolver_factory_mojo_unittest.cc",
1504 "proxy/proxy_service_mojo_unittest.cc", 1504 "proxy/proxy_service_mojo_unittest.cc",
1505 ] 1505 ]
1506 } 1506 }
1507 1507
1508 if (!enable_mdns) { 1508 if (!enable_mdns) {
1509 sources -= [ 1509 sources -= [
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1623 } else { 1623 } else {
1624 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1624 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1625 } 1625 }
1626 1626
1627 if (is_win && icu_use_data_file) { 1627 if (is_win && icu_use_data_file) {
1628 # This is needed to trigger the dll copy step on windows. 1628 # This is needed to trigger the dll copy step on windows.
1629 # TODO(mark): Specifying this here shouldn't be necessary. 1629 # TODO(mark): Specifying this here shouldn't be necessary.
1630 deps += [ "//third_party/icu:icudata" ] 1630 deps += [ "//third_party/icu:icudata" ]
1631 } 1631 }
1632 } 1632 }
OLDNEW
« no previous file with comments | « no previous file | net/interfaces/proxy_resolver_service.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698