Chromium Code Reviews| 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 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 783 ] | 783 ] |
| 784 deps = [ | 784 deps = [ |
| 785 "//base", | 785 "//base", |
| 786 "//gin", | 786 "//gin", |
| 787 "//url", | 787 "//url", |
| 788 "//v8", | 788 "//v8", |
| 789 ] | 789 ] |
| 790 } | 790 } |
| 791 } | 791 } |
| 792 | 792 |
| 793 if (use_v8_in_net && !is_android) { | |
| 794 static_library("net_browser_services") { | |
| 795 sources = [ | |
| 796 "dns/host_resolver_service_impl.cc", | |
| 797 "dns/host_resolver_service_impl.h", | |
| 798 ] | |
| 799 | |
| 800 defines = [ "NET_IMPLEMENTATION" ] | |
|
Sam McNally
2015/02/05 23:58:36
Remove.
Anand Mistry (off Chromium)
2015/02/06 06:32:40
Done.
| |
| 801 public_deps = [ | |
| 802 ":net", | |
| 803 ":type_converters", | |
| 804 "//net/interfaces", | |
| 805 "//third_party/mojo/src/mojo/public/cpp/bindings", | |
| 806 ] | |
| 807 deps = [ | |
| 808 "//mojo/environment:chromium", | |
|
Sam McNally
2015/02/05 23:58:36
This should be in test deps instead.
Anand Mistry (off Chromium)
2015/02/06 06:32:40
Done.
| |
| 809 "//third_party/mojo/src/mojo/edk/system", | |
| 810 ] | |
| 811 } | |
| 812 | |
| 813 static_library("type_converters") { | |
| 814 sources = [ | |
| 815 "dns/type_converters.cc", | |
| 816 "dns/type_converters.h", | |
| 817 ] | |
| 818 | |
| 819 public_deps = [ | |
| 820 "//net", | |
| 821 "//net/interfaces", | |
| 822 "//third_party/mojo/src/mojo/public/cpp/bindings", | |
| 823 ] | |
| 824 } | |
| 825 } | |
| 826 | |
| 793 if (!is_ios && !is_android) { | 827 if (!is_ios && !is_android) { |
| 794 executable("crash_cache") { | 828 executable("crash_cache") { |
| 795 testonly = true | 829 testonly = true |
| 796 sources = [ | 830 sources = [ |
| 797 "tools/crash_cache/crash_cache.cc", | 831 "tools/crash_cache/crash_cache.cc", |
| 798 ] | 832 ] |
| 799 configs += [ ":net_win_size_truncation" ] | 833 configs += [ ":net_win_size_truncation" ] |
| 800 deps = [ | 834 deps = [ |
| 801 ":net", | 835 ":net", |
| 802 ":test_support", | 836 ":test_support", |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1312 # setting use_v8_in_net to 0. | 1346 # setting use_v8_in_net to 0. |
| 1313 if (use_v8_in_net && !use_icu_alternatives_on_android) { | 1347 if (use_v8_in_net && !use_icu_alternatives_on_android) { |
| 1314 deps += [ ":net_with_v8" ] | 1348 deps += [ ":net_with_v8" ] |
| 1315 } else { | 1349 } else { |
| 1316 sources -= [ | 1350 sources -= [ |
| 1317 "proxy/proxy_resolver_v8_unittest.cc", | 1351 "proxy/proxy_resolver_v8_unittest.cc", |
| 1318 "proxy/proxy_resolver_v8_tracing_unittest.cc", | 1352 "proxy/proxy_resolver_v8_tracing_unittest.cc", |
| 1319 ] | 1353 ] |
| 1320 } | 1354 } |
| 1321 | 1355 |
| 1356 if (use_v8_in_net && !is_android) { | |
| 1357 deps += [ | |
| 1358 ":net_browser_services", | |
| 1359 "//third_party/mojo/src/mojo/edk/system", | |
| 1360 ] | |
| 1361 } else { | |
| 1362 sources -= [ "dns/host_resolver_service_impl_unittest.cc" ] | |
| 1363 } | |
| 1364 | |
| 1322 if (!enable_mdns) { | 1365 if (!enable_mdns) { |
| 1323 sources -= [ | 1366 sources -= [ |
| 1324 "dns/mdns_cache_unittest.cc", | 1367 "dns/mdns_cache_unittest.cc", |
| 1325 "dns/mdns_client_unittest.cc", | 1368 "dns/mdns_client_unittest.cc", |
| 1326 "dns/record_parsed_unittest.cc", | 1369 "dns/record_parsed_unittest.cc", |
| 1327 "dns/record_rdata_unittest.cc", | 1370 "dns/record_rdata_unittest.cc", |
| 1328 ] | 1371 ] |
| 1329 } | 1372 } |
| 1330 | 1373 |
| 1331 if (is_ios) { | 1374 if (is_ios) { |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1407 "quic/quic_server_bin.cc", | 1450 "quic/quic_server_bin.cc", |
| 1408 ] | 1451 ] |
| 1409 deps = [ | 1452 deps = [ |
| 1410 ":quic_tools", | 1453 ":quic_tools", |
| 1411 ":net", | 1454 ":net", |
| 1412 "//base", | 1455 "//base", |
| 1413 "//third_party/boringssl", | 1456 "//third_party/boringssl", |
| 1414 ] | 1457 ] |
| 1415 } | 1458 } |
| 1416 } # !is_android && !is_win && !is_mac | 1459 } # !is_android && !is_win && !is_mac |
| OLD | NEW |