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

Side by Side Diff: net/BUILD.gn

Issue 569683003: Only depend on NSS in one place. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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/net.gyp » ('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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 if (is_win) { 451 if (is_win) {
452 sources -= [ 452 sources -= [
453 "http/http_auth_handler_ntlm_portable.cc", 453 "http/http_auth_handler_ntlm_portable.cc",
454 "socket/socket_libevent.cc", 454 "socket/socket_libevent.cc",
455 "socket/socket_libevent.h", 455 "socket/socket_libevent.h",
456 "socket/tcp_socket_libevent.cc", 456 "socket/tcp_socket_libevent.cc",
457 "socket/tcp_socket_libevent.h", 457 "socket/tcp_socket_libevent.h",
458 "udp/udp_socket_libevent.cc", 458 "udp/udp_socket_libevent.cc",
459 "udp/udp_socket_libevent.h", 459 "udp/udp_socket_libevent.h",
460 ] 460 ]
461 deps += [
462 "//third_party/nss:nspr",
463 "//third_party/nss",
464 ]
465 } else { # !is_win 461 } else { # !is_win
466 sources -= [ 462 sources -= [
467 "base/winsock_init.cc", 463 "base/winsock_init.cc",
468 "base/winsock_init.h", 464 "base/winsock_init.h",
469 "base/winsock_util.cc", 465 "base/winsock_util.cc",
470 "base/winsock_util.h", 466 "base/winsock_util.h",
471 "proxy/proxy_resolver_winhttp.cc", 467 "proxy/proxy_resolver_winhttp.cc",
472 "proxy/proxy_resolver_winhttp.h", 468 "proxy/proxy_resolver_winhttp.h",
473 ] 469 ]
474 } 470 }
475 471
476 if (is_mac) { 472 if (is_mac) {
477 if (!use_openssl) {
478 deps += [
479 "//third_party/nss:nspr",
480 "//third_party/nss",
481 ]
482 }
483 libs = [ 473 libs = [
484 "Foundation.framework", 474 "Foundation.framework",
485 "Security.framework", 475 "Security.framework",
486 "SystemConfiguration.framework", 476 "SystemConfiguration.framework",
487 "resolv", 477 "resolv",
488 ] 478 ]
489 } 479 }
490 480
491 if (is_ios) { 481 if (is_ios) {
492 # Add back some sources that were otherwise filtered out. iOS additionally 482 # Add back some sources that were otherwise filtered out. iOS additionally
493 # doesn't set USE_NSS but needs some of the files. 483 # doesn't set USE_NSS but needs some of the files.
494 set_sources_assignment_filter([]) 484 set_sources_assignment_filter([])
495 sources += [ 485 sources += [
496 "base/network_change_notifier_mac.cc", 486 "base/network_change_notifier_mac.cc",
497 "base/network_config_watcher_mac.cc", 487 "base/network_config_watcher_mac.cc",
498 "base/platform_mime_util_mac.mm", 488 "base/platform_mime_util_mac.mm",
499 "cert/cert_verify_proc_nss.cc", 489 "cert/cert_verify_proc_nss.cc",
500 "cert/cert_verify_proc_nss.h", 490 "cert/cert_verify_proc_nss.h",
501 "cert/test_root_certs_nss.cc", 491 "cert/test_root_certs_nss.cc",
502 "cert/x509_util_nss.cc", 492 "cert/x509_util_nss.cc",
503 "cert/x509_util_nss.h", 493 "cert/x509_util_nss.h",
504 "proxy/proxy_resolver_mac.cc", 494 "proxy/proxy_resolver_mac.cc",
505 "proxy/proxy_server_mac.cc", 495 "proxy/proxy_server_mac.cc",
506 "ocsp/nss_ocsp.cc", 496 "ocsp/nss_ocsp.cc",
507 "ocsp/nss_ocsp.h", 497 "ocsp/nss_ocsp.h",
508 ] 498 ]
509 set_sources_assignment_filter(sources_assignment_filter) 499 set_sources_assignment_filter(sources_assignment_filter)
510 500
511 sources -= [ "disk_cache/blockfile/file_posix.cc" ] 501 sources -= [ "disk_cache/blockfile/file_posix.cc" ]
512 deps += [
513 "//third_party/nss",
514 ]
515 libs = [ 502 libs = [
516 "CFNetwork.framework", 503 "CFNetwork.framework",
517 "MobileCoreServices.framework", 504 "MobileCoreServices.framework",
518 "Security.framework", 505 "Security.framework",
519 "SystemConfiguration.framework", 506 "SystemConfiguration.framework",
520 "resolv", 507 "resolv",
521 ] 508 ]
522 } 509 }
523 510
524 if (is_android) { 511 if (is_android) {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 "//base", 688 "//base",
702 "//base/test:test_support", 689 "//base/test:test_support",
703 "//crypto", 690 "//crypto",
704 "//net", 691 "//net",
705 "//net/tools/tld_cleanup", 692 "//net/tools/tld_cleanup",
706 "//testing/gmock", 693 "//testing/gmock",
707 "//testing/gtest", 694 "//testing/gtest",
708 "//url", 695 "//url",
709 ] 696 ]
710 697
711 if (is_ios) { 698 if (!use_openssl && (use_nss_certs || is_ios)) {
712 public_deps += [ "//third_party/nss" ] 699 public_deps += ["//crypto:platform" ]
713 } 700 }
714 701
715 if (!is_android) { 702 if (!is_android) {
716 sources -= [ 703 sources -= [
717 "test/spawned_test_server/remote_test_server.cc", 704 "test/spawned_test_server/remote_test_server.cc",
718 "test/spawned_test_server/remote_test_server.h", 705 "test/spawned_test_server/remote_test_server.h",
719 "test/spawned_test_server/spawner_communicator.cc", 706 "test/spawned_test_server/spawner_communicator.cc",
720 "test/spawned_test_server/spawner_communicator.h", 707 "test/spawned_test_server/spawner_communicator.h",
721 ] 708 ]
722 } 709 }
723 710
724 if (use_v8_in_net) { 711 if (use_v8_in_net) {
725 public_deps += [ ":net_with_v8" ] 712 public_deps += [ ":net_with_v8" ]
726 } 713 }
727 714
728 if (!enable_mdns) { 715 if (!enable_mdns) {
729 sources -= [ 716 sources -= [
730 "dns/mock_mdns_socket_factory.cc", 717 "dns/mock_mdns_socket_factory.cc",
731 "dns/mock_mdns_socket_factory.h", 718 "dns/mock_mdns_socket_factory.h",
732 ] 719 ]
733 } 720 }
734 721
735 if (use_nss_certs) { 722 if (!use_nss_certs) {
736 public_deps += ["//crypto:platform" ]
737 } else {
738 sources -= [ 723 sources -= [
739 "test/cert_test_util_nss.cc", 724 "test/cert_test_util_nss.cc",
740 ] 725 ]
741 } 726 }
742 } 727 }
743 728
744 source_set("balsa") { 729 source_set("balsa") {
745 sources = [ 730 sources = [
746 "tools/balsa/balsa_enums.h", 731 "tools/balsa/balsa_enums.h",
747 "tools/balsa/balsa_frame.cc", 732 "tools/balsa/balsa_frame.cc",
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 sources = [ "quic/quic_server_bin.cc" ] 1373 sources = [ "quic/quic_server_bin.cc" ]
1389 deps = [ 1374 deps = [
1390 ":quic_tools", 1375 ":quic_tools",
1391 ":net", 1376 ":net",
1392 "//base", 1377 "//base",
1393 "//third_party/boringssl", 1378 "//third_party/boringssl",
1394 ] 1379 ]
1395 } 1380 }
1396 1381
1397 } # !is_android 1382 } # !is_android
OLDNEW
« no previous file with comments | « no previous file | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698