| 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/chromecast_build.gni") | 5 import("//build/config/chromecast_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//build_overrides/v8.gni") | 10 import("//build_overrides/v8.gni") |
| (...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 "base/address_tracker_linux.h", | 373 "base/address_tracker_linux.h", |
| 374 "base/network_interfaces_linux.cc", | 374 "base/network_interfaces_linux.cc", |
| 375 "base/network_interfaces_linux.h", | 375 "base/network_interfaces_linux.h", |
| 376 "base/platform_mime_util_linux.cc", | 376 "base/platform_mime_util_linux.cc", |
| 377 ] | 377 ] |
| 378 } | 378 } |
| 379 } else { | 379 } else { |
| 380 net_shared_public_deps += [ "//native_client_sdk/src/libraries/nacl_io" ] | 380 net_shared_public_deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
| 381 } | 381 } |
| 382 | 382 |
| 383 component("net") { | 383 static_library("net") { |
| 384 # TODO(crbug.com/559766) this should be a component but |
| 385 # there are static initializers that get accidentally linked |
| 386 # into chrome from that need to be addressed first. |
| 384 sources = net_shared_sources | 387 sources = net_shared_sources |
| 385 | 388 |
| 386 # Add back some sources that were otherwise filtered out. | 389 # Add back some sources that were otherwise filtered out. |
| 387 set_sources_assignment_filter([]) | 390 set_sources_assignment_filter([]) |
| 388 sources += net_shared_unfiltered_sources | 391 sources += net_shared_unfiltered_sources |
| 389 set_sources_assignment_filter(sources_assignment_filter) | 392 set_sources_assignment_filter(sources_assignment_filter) |
| 390 | 393 |
| 391 cflags = [] | 394 cflags = [] |
| 392 configs += net_shared_configs | 395 configs += net_shared_configs |
| 393 public_configs = [ ":net_config" ] | 396 public_configs = [ ":net_config" ] |
| (...skipping 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1688 if (enable_websockets) { | 1691 if (enable_websockets) { |
| 1689 sources += [ "websockets/websocket_frame_perftest.cc" ] | 1692 sources += [ "websockets/websocket_frame_perftest.cc" ] |
| 1690 } | 1693 } |
| 1691 | 1694 |
| 1692 if (use_v8_in_net) { | 1695 if (use_v8_in_net) { |
| 1693 deps += [ ":net_with_v8" ] | 1696 deps += [ ":net_with_v8" ] |
| 1694 } else { | 1697 } else { |
| 1695 sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 1698 sources -= [ "proxy/proxy_resolver_perftest.cc" ] |
| 1696 } | 1699 } |
| 1697 } | 1700 } |
| OLD | NEW |