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 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
791 "//v8", | 791 "//v8", |
792 ] | 792 ] |
793 } | 793 } |
794 } | 794 } |
795 | 795 |
796 if (use_v8_in_net && !is_android) { | 796 if (use_v8_in_net && !is_android) { |
797 source_set("net_browser_services") { | 797 source_set("net_browser_services") { |
798 sources = [ | 798 sources = [ |
799 "dns/mojo_host_resolver_impl.cc", | 799 "dns/mojo_host_resolver_impl.cc", |
800 "dns/mojo_host_resolver_impl.h", | 800 "dns/mojo_host_resolver_impl.h", |
801 "proxy/in_process_mojo_proxy_resolver_factory.cc", | |
802 "proxy/in_process_mojo_proxy_resolver_factory.h", | |
801 "proxy/mojo_proxy_resolver_factory.h", | 803 "proxy/mojo_proxy_resolver_factory.h", |
802 "proxy/proxy_resolver_mojo.cc", | 804 "proxy/proxy_resolver_mojo.cc", |
803 "proxy/proxy_resolver_mojo.h", | 805 "proxy/proxy_resolver_mojo.h", |
806 "proxy/proxy_service_mojo.cc", | |
807 "proxy/proxy_service_mojo.h", | |
804 ] | 808 ] |
805 | 809 |
806 public_deps = [ | 810 public_deps = [ |
807 ":mojo_type_converters", | 811 ":mojo_type_converters", |
808 ":net", | 812 ":net", |
809 "//base", | 813 "//base", |
810 "//mojo/common", | 814 "//mojo/common", |
811 "//net/interfaces", | 815 "//net/interfaces", |
812 "//third_party/mojo/src/mojo/public/cpp/bindings", | 816 "//third_party/mojo/src/mojo/public/cpp/bindings", |
817 | |
818 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we need | |
819 # this dependency since in_process_mojo_proxy_resolver_factory creates | |
820 # the utility process side Mojo services in the browser process. | |
821 # Ultimately, this will go away when we only support out-of-process. | |
822 ":net_utility_services", | |
813 ] | 823 ] |
814 } | 824 } |
815 | 825 |
816 source_set("mojo_type_converters") { | 826 source_set("mojo_type_converters") { |
817 sources = [ | 827 sources = [ |
818 "dns/mojo_host_type_converters.cc", | 828 "dns/mojo_host_type_converters.cc", |
819 "dns/mojo_host_type_converters.h", | 829 "dns/mojo_host_type_converters.h", |
820 "proxy/mojo_proxy_type_converters.cc", | 830 "proxy/mojo_proxy_type_converters.cc", |
821 "proxy/mojo_proxy_type_converters.h", | 831 "proxy/mojo_proxy_type_converters.h", |
822 ] | 832 ] |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
943 } | 953 } |
944 | 954 |
945 executable("run_testserver") { | 955 executable("run_testserver") { |
946 testonly = true | 956 testonly = true |
947 sources = [ | 957 sources = [ |
948 "tools/testserver/run_testserver.cc", | 958 "tools/testserver/run_testserver.cc", |
949 ] | 959 ] |
950 deps = [ | 960 deps = [ |
951 ":net", # TODO(brettw) bug 363749: this shouldn't be necessary. It's not | 961 ":net", # TODO(brettw) bug 363749: this shouldn't be necessary. It's not |
952 # in the GYP build, and can be removed when the bug is fixed. | 962 # in the GYP build, and can be removed when the bug is fixed. |
963 | |
eroman
2015/03/11 21:08:19
extra space added
Anand Mistry (off Chromium)
2015/03/12 04:51:42
Removed.
| |
953 ":test_support", | 964 ":test_support", |
954 "//base", | 965 "//base", |
955 "//base/test:test_support", | 966 "//base/test:test_support", |
956 "//testing/gtest", | 967 "//testing/gtest", |
957 ] | 968 ] |
958 } | 969 } |
959 | 970 |
960 executable("stress_cache") { | 971 executable("stress_cache") { |
961 testonly = true | 972 testonly = true |
962 sources = [ | 973 sources = [ |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1404 "//mojo/environment:chromium", | 1415 "//mojo/environment:chromium", |
1405 "//third_party/mojo/src/mojo/edk/system", | 1416 "//third_party/mojo/src/mojo/edk/system", |
1406 ] | 1417 ] |
1407 } else { | 1418 } else { |
1408 sources -= [ | 1419 sources -= [ |
1409 "dns/host_resolver_mojo_unittest.cc", | 1420 "dns/host_resolver_mojo_unittest.cc", |
1410 "dns/mojo_host_resolver_impl_unittest.cc", | 1421 "dns/mojo_host_resolver_impl_unittest.cc", |
1411 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", | 1422 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", |
1412 "proxy/mojo_proxy_resolver_impl_unittest.cc", | 1423 "proxy/mojo_proxy_resolver_impl_unittest.cc", |
1413 "proxy/proxy_resolver_mojo_unittest.cc", | 1424 "proxy/proxy_resolver_mojo_unittest.cc", |
1425 "proxy/proxy_service_mojo_unittest.cc", | |
1414 ] | 1426 ] |
1415 } | 1427 } |
1416 | 1428 |
1417 if (!enable_mdns) { | 1429 if (!enable_mdns) { |
1418 sources -= [ | 1430 sources -= [ |
1419 "dns/mdns_cache_unittest.cc", | 1431 "dns/mdns_cache_unittest.cc", |
1420 "dns/mdns_client_unittest.cc", | 1432 "dns/mdns_client_unittest.cc", |
1421 "dns/record_parsed_unittest.cc", | 1433 "dns/record_parsed_unittest.cc", |
1422 "dns/record_rdata_unittest.cc", | 1434 "dns/record_rdata_unittest.cc", |
1423 ] | 1435 ] |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1502 "quic/quic_server_bin.cc", | 1514 "quic/quic_server_bin.cc", |
1503 ] | 1515 ] |
1504 deps = [ | 1516 deps = [ |
1505 ":quic_tools", | 1517 ":quic_tools", |
1506 ":net", | 1518 ":net", |
1507 "//base", | 1519 "//base", |
1508 "//third_party/boringssl", | 1520 "//third_party/boringssl", |
1509 ] | 1521 ] |
1510 } | 1522 } |
1511 } # !is_android && !is_win && !is_mac | 1523 } # !is_android && !is_win && !is_mac |
OLD | NEW |