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

Side by Side Diff: net/BUILD.gn

Issue 734063004: Update from https://crrev.com/304418 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « mojo/tools/roll/cc_strip_video.patch ('k') | net/base/net_info_source_list.h » ('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("//url/config.gni") 8 import("//url/config.gni")
9 9
10 # TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni. 10 # TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni.
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 "SystemConfiguration.framework", 466 "SystemConfiguration.framework",
467 "resolv", 467 "resolv",
468 ] 468 ]
469 } 469 }
470 470
471 if (is_ios) { 471 if (is_ios) {
472 # Add back some sources that were otherwise filtered out. iOS additionally 472 # Add back some sources that were otherwise filtered out. iOS additionally
473 # doesn't set USE_NSS but needs some of the files. 473 # doesn't set USE_NSS but needs some of the files.
474 set_sources_assignment_filter([]) 474 set_sources_assignment_filter([])
475 sources += [ 475 sources += [
476 "base/net_util_mac.cc",
477 "base/net_util_mac.h",
476 "base/network_change_notifier_mac.cc", 478 "base/network_change_notifier_mac.cc",
477 "base/network_config_watcher_mac.cc", 479 "base/network_config_watcher_mac.cc",
478 "base/platform_mime_util_mac.mm", 480 "base/platform_mime_util_mac.mm",
479 "cert/cert_verify_proc_nss.cc", 481 "cert/cert_verify_proc_nss.cc",
480 "cert/cert_verify_proc_nss.h", 482 "cert/cert_verify_proc_nss.h",
481 "cert/test_root_certs_nss.cc", 483 "cert/test_root_certs_nss.cc",
482 "cert/x509_util_nss.cc", 484 "cert/x509_util_nss.cc",
483 "cert/x509_util_nss.h", 485 "cert/x509_util_nss.h",
484 "proxy/proxy_resolver_mac.cc", 486 "proxy/proxy_resolver_mac.cc",
485 "proxy/proxy_server_mac.cc", 487 "proxy/proxy_server_mac.cc",
(...skipping 13 matching lines...) Expand all
499 } 501 }
500 502
501 if (is_android) { 503 if (is_android) {
502 # Add some Linux sources that were excluded by the filter, but which 504 # Add some Linux sources that were excluded by the filter, but which
503 # are needed. 505 # are needed.
504 set_sources_assignment_filter([]) 506 set_sources_assignment_filter([])
505 sources += [ 507 sources += [
506 "base/platform_mime_util_linux.cc", 508 "base/platform_mime_util_linux.cc",
507 "base/address_tracker_linux.cc", 509 "base/address_tracker_linux.cc",
508 "base/address_tracker_linux.h", 510 "base/address_tracker_linux.h",
511 "base/net_util_linux.cc",
512 "base/net_util_linux.h"
509 ] 513 ]
510 set_sources_assignment_filter(sources_assignment_filter) 514 set_sources_assignment_filter(sources_assignment_filter)
511 515
512 if (!is_android_webview_build) { 516 if (!is_android_webview_build) {
513 deps += [ ":net_jni_headers" ] 517 deps += [ ":net_jni_headers" ]
514 } 518 }
515 } 519 }
516 520
517 if (use_icu_alternatives_on_android) { 521 if (use_icu_alternatives_on_android) {
518 deps -= [ 522 deps -= [
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
1372 sources = [ "quic/quic_server_bin.cc" ] 1376 sources = [ "quic/quic_server_bin.cc" ]
1373 deps = [ 1377 deps = [
1374 ":quic_tools", 1378 ":quic_tools",
1375 ":net", 1379 ":net",
1376 "//base", 1380 "//base",
1377 "//third_party/boringssl", 1381 "//third_party/boringssl",
1378 ] 1382 ]
1379 } 1383 }
1380 1384
1381 } # !is_android && !is_win && !is_mac 1385 } # !is_android && !is_win && !is_mac
OLDNEW
« no previous file with comments | « mojo/tools/roll/cc_strip_video.patch ('k') | net/base/net_info_source_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698