| 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/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") |
| 6 import("//build/config/chromecast_build.gni") | 6 import("//build/config/chromecast_build.gni") |
| 7 import("//build/config/compiler/compiler.gni") | 7 import("//build/config/compiler/compiler.gni") |
| 8 import("//build/config/crypto.gni") | 8 import("//build/config/crypto.gni") |
| 9 import("//build/config/features.gni") | 9 import("//build/config/features.gni") |
| 10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") |
| (...skipping 1564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1575 "proxy/proxy_resolver_v8_tracing_unittest.cc", | 1575 "proxy/proxy_resolver_v8_tracing_unittest.cc", |
| 1576 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc", | 1576 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc", |
| 1577 "proxy/proxy_resolver_v8_unittest.cc", | 1577 "proxy/proxy_resolver_v8_unittest.cc", |
| 1578 ] | 1578 ] |
| 1579 } | 1579 } |
| 1580 | 1580 |
| 1581 if (use_v8_in_net && !is_android) { | 1581 if (use_v8_in_net && !is_android) { |
| 1582 deps += [ | 1582 deps += [ |
| 1583 ":net_browser_services", | 1583 ":net_browser_services", |
| 1584 ":net_utility_services", | 1584 ":net_utility_services", |
| 1585 "//mojo/edk/system", |
| 1585 "//mojo/environment:chromium", | 1586 "//mojo/environment:chromium", |
| 1586 "//third_party/mojo/src/mojo/edk/system", | |
| 1587 ] | 1587 ] |
| 1588 } else { | 1588 } else { |
| 1589 sources -= [ | 1589 sources -= [ |
| 1590 "dns/host_resolver_mojo_unittest.cc", | 1590 "dns/host_resolver_mojo_unittest.cc", |
| 1591 "dns/mojo_host_resolver_impl_unittest.cc", | 1591 "dns/mojo_host_resolver_impl_unittest.cc", |
| 1592 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", | 1592 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", |
| 1593 "proxy/mojo_proxy_resolver_impl_unittest.cc", | 1593 "proxy/mojo_proxy_resolver_impl_unittest.cc", |
| 1594 "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc", | 1594 "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc", |
| 1595 "proxy/proxy_resolver_factory_mojo_unittest.cc", | 1595 "proxy/proxy_resolver_factory_mojo_unittest.cc", |
| 1596 "proxy/proxy_service_mojo_unittest.cc", | 1596 "proxy/proxy_service_mojo_unittest.cc", |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1733 } else { | 1733 } else { |
| 1734 sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 1734 sources -= [ "proxy/proxy_resolver_perftest.cc" ] |
| 1735 } | 1735 } |
| 1736 } | 1736 } |
| 1737 | 1737 |
| 1738 buildflag_header("features") { | 1738 buildflag_header("features") { |
| 1739 header = "net_features.h" | 1739 header = "net_features.h" |
| 1740 | 1740 |
| 1741 flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ] | 1741 flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ] |
| 1742 } | 1742 } |
| OLD | NEW |