| 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 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1583 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc", | 1583 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc", |
| 1584 "proxy/proxy_resolver_v8_unittest.cc", | 1584 "proxy/proxy_resolver_v8_unittest.cc", |
| 1585 ] | 1585 ] |
| 1586 } | 1586 } |
| 1587 | 1587 |
| 1588 if (use_v8_in_net && !is_android) { | 1588 if (use_v8_in_net && !is_android) { |
| 1589 deps += [ | 1589 deps += [ |
| 1590 ":net_browser_services", | 1590 ":net_browser_services", |
| 1591 ":net_utility_services", | 1591 ":net_utility_services", |
| 1592 "//mojo/edk/system", | 1592 "//mojo/edk/system", |
| 1593 "//mojo/environment:chromium", | |
| 1594 ] | 1593 ] |
| 1595 } else { | 1594 } else { |
| 1596 sources -= [ | 1595 sources -= [ |
| 1597 "dns/host_resolver_mojo_unittest.cc", | 1596 "dns/host_resolver_mojo_unittest.cc", |
| 1598 "dns/mojo_host_resolver_impl_unittest.cc", | 1597 "dns/mojo_host_resolver_impl_unittest.cc", |
| 1599 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", | 1598 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", |
| 1600 "proxy/mojo_proxy_resolver_impl_unittest.cc", | 1599 "proxy/mojo_proxy_resolver_impl_unittest.cc", |
| 1601 "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc", | 1600 "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc", |
| 1602 "proxy/proxy_resolver_factory_mojo_unittest.cc", | 1601 "proxy/proxy_resolver_factory_mojo_unittest.cc", |
| 1603 "proxy/proxy_service_mojo_unittest.cc", | 1602 "proxy/proxy_service_mojo_unittest.cc", |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1922 "//base", | 1921 "//base", |
| 1923 "//net", | 1922 "//net", |
| 1924 ] | 1923 ] |
| 1925 } | 1924 } |
| 1926 | 1925 |
| 1927 buildflag_header("features") { | 1926 buildflag_header("features") { |
| 1928 header = "net_features.h" | 1927 header = "net_features.h" |
| 1929 | 1928 |
| 1930 flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ] | 1929 flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ] |
| 1931 } | 1930 } |
| OLD | NEW |