Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

Side by Side Diff: net/BUILD.gn

Issue 1154323007: Split network_interfaces.h off of net_utils.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ip_util
Patch Set: address matt's comments Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | net/base/address_tracker_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 "SystemConfiguration.framework", 435 "SystemConfiguration.framework",
436 "resolv", 436 "resolv",
437 ] 437 ]
438 } 438 }
439 439
440 if (is_ios) { 440 if (is_ios) {
441 # Add back some sources that were otherwise filtered out. iOS needs some Mac 441 # Add back some sources that were otherwise filtered out. iOS needs some Mac
442 # files. 442 # files.
443 set_sources_assignment_filter([]) 443 set_sources_assignment_filter([])
444 sources += [ 444 sources += [
445 "base/net_util_mac.cc",
446 "base/net_util_mac.h",
447 "base/network_change_notifier_mac.cc", 445 "base/network_change_notifier_mac.cc",
448 "base/network_config_watcher_mac.cc", 446 "base/network_config_watcher_mac.cc",
447 "base/network_interfaces_mac.cc",
448 "base/network_interfaces_mac.h",
449 "base/platform_mime_util_mac.mm", 449 "base/platform_mime_util_mac.mm",
450 "proxy/proxy_resolver_mac.cc", 450 "proxy/proxy_resolver_mac.cc",
451 "proxy/proxy_server_mac.cc", 451 "proxy/proxy_server_mac.cc",
452 ] 452 ]
453 set_sources_assignment_filter(sources_assignment_filter) 453 set_sources_assignment_filter(sources_assignment_filter)
454 454
455 sources -= [ "disk_cache/blockfile/file_posix.cc" ] 455 sources -= [ "disk_cache/blockfile/file_posix.cc" ]
456 libs = [ 456 libs = [
457 "CFNetwork.framework", 457 "CFNetwork.framework",
458 "MobileCoreServices.framework", 458 "MobileCoreServices.framework",
459 "Security.framework", 459 "Security.framework",
460 "SystemConfiguration.framework", 460 "SystemConfiguration.framework",
461 "resolv", 461 "resolv",
462 ] 462 ]
463 } 463 }
464 464
465 if (is_ios || is_mac) { 465 if (is_ios || is_mac) {
466 sources += gypi_values.net_base_mac_ios_sources 466 sources += gypi_values.net_base_mac_ios_sources
467 } 467 }
468 468
469 if (is_android) { 469 if (is_android) {
470 # Add some Linux sources that were excluded by the filter, but which 470 # Add some Linux sources that were excluded by the filter, but which
471 # are needed. 471 # are needed.
472 set_sources_assignment_filter([]) 472 set_sources_assignment_filter([])
473 sources += [ 473 sources += [
474 "base/address_tracker_linux.cc", 474 "base/address_tracker_linux.cc",
475 "base/address_tracker_linux.h", 475 "base/address_tracker_linux.h",
476 "base/net_util_linux.cc", 476 "base/network_interfaces_linux.cc",
477 "base/net_util_linux.h", 477 "base/network_interfaces_linux.h",
478 "base/platform_mime_util_linux.cc", 478 "base/platform_mime_util_linux.cc",
479 ] 479 ]
480 set_sources_assignment_filter(sources_assignment_filter) 480 set_sources_assignment_filter(sources_assignment_filter)
481 deps += [ ":net_jni_headers" ] 481 deps += [ ":net_jni_headers" ]
482 } 482 }
483 483
484 if (use_icu_alternatives_on_android) { 484 if (use_icu_alternatives_on_android) {
485 sources += [ 485 sources += [
486 "base/net_string_util_icu_alternatives_android.cc", 486 "base/net_string_util_icu_alternatives_android.cc",
487 "base/net_string_util_icu_alternatives_android.h", 487 "base/net_string_util_icu_alternatives_android.h",
(...skipping 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 } else { 1618 } else {
1619 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1619 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1620 } 1620 }
1621 1621
1622 if (is_win && icu_use_data_file) { 1622 if (is_win && icu_use_data_file) {
1623 # This is needed to trigger the dll copy step on windows. 1623 # This is needed to trigger the dll copy step on windows.
1624 # TODO(mark): Specifying this here shouldn't be necessary. 1624 # TODO(mark): Specifying this here shouldn't be necessary.
1625 deps += [ "//third_party/icu:icudata" ] 1625 deps += [ "//third_party/icu:icudata" ]
1626 } 1626 }
1627 } 1627 }
OLDNEW
« no previous file with comments | « no previous file | net/base/address_tracker_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698