| 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/compiler/compiler.gni") | 5 import("//build/config/compiler/compiler.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//build/module_args/v8.gni") | 9 import("//build/module_args/v8.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1528 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc", | 1528 "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc", |
| 1529 "proxy/proxy_resolver_v8_unittest.cc", | 1529 "proxy/proxy_resolver_v8_unittest.cc", |
| 1530 ] | 1530 ] |
| 1531 } | 1531 } |
| 1532 | 1532 |
| 1533 if (use_v8_in_net && !is_android) { | 1533 if (use_v8_in_net && !is_android) { |
| 1534 deps += [ | 1534 deps += [ |
| 1535 ":net_browser_services", | 1535 ":net_browser_services", |
| 1536 ":net_utility_services", | 1536 ":net_utility_services", |
| 1537 "//mojo/environment:chromium", | 1537 "//mojo/environment:chromium", |
| 1538 "//third_party/mojo/src/mojo/edk/system", | |
| 1539 ] | 1538 ] |
| 1539 |
| 1540 if (use_chrome_edk) { |
| 1541 deps += [ "//mojo/edk/system" ] |
| 1542 } else { |
| 1543 deps += [ "//third_party/mojo/src/mojo/edk/system" ] |
| 1544 } |
| 1540 } else { | 1545 } else { |
| 1541 sources -= [ | 1546 sources -= [ |
| 1542 "dns/host_resolver_mojo_unittest.cc", | 1547 "dns/host_resolver_mojo_unittest.cc", |
| 1543 "dns/mojo_host_resolver_impl_unittest.cc", | 1548 "dns/mojo_host_resolver_impl_unittest.cc", |
| 1544 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", | 1549 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", |
| 1545 "proxy/mojo_proxy_resolver_impl_unittest.cc", | 1550 "proxy/mojo_proxy_resolver_impl_unittest.cc", |
| 1546 "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc", | 1551 "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc", |
| 1547 "proxy/proxy_resolver_factory_mojo_unittest.cc", | 1552 "proxy/proxy_resolver_factory_mojo_unittest.cc", |
| 1548 "proxy/proxy_service_mojo_unittest.cc", | 1553 "proxy/proxy_service_mojo_unittest.cc", |
| 1549 ] | 1554 ] |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1669 if (enable_websockets) { | 1674 if (enable_websockets) { |
| 1670 sources += [ "websockets/websocket_frame_perftest.cc" ] | 1675 sources += [ "websockets/websocket_frame_perftest.cc" ] |
| 1671 } | 1676 } |
| 1672 | 1677 |
| 1673 if (use_v8_in_net) { | 1678 if (use_v8_in_net) { |
| 1674 deps += [ ":net_with_v8" ] | 1679 deps += [ ":net_with_v8" ] |
| 1675 } else { | 1680 } else { |
| 1676 sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 1681 sources -= [ "proxy/proxy_resolver_perftest.cc" ] |
| 1677 } | 1682 } |
| 1678 } | 1683 } |
| OLD | NEW |