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

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: Appease iOS again 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 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 if (is_win) { 453 if (is_win) {
454 sources -= [ 454 sources -= [
455 "http/http_auth_handler_ntlm_portable.cc", 455 "http/http_auth_handler_ntlm_portable.cc",
456 "socket/socket_libevent.cc", 456 "socket/socket_libevent.cc",
457 "socket/socket_libevent.h", 457 "socket/socket_libevent.h",
458 "socket/tcp_socket_libevent.cc", 458 "socket/tcp_socket_libevent.cc",
459 "socket/tcp_socket_libevent.h", 459 "socket/tcp_socket_libevent.h",
460 "udp/udp_socket_libevent.cc", 460 "udp/udp_socket_libevent.cc",
461 "udp/udp_socket_libevent.h", 461 "udp/udp_socket_libevent.h",
462 ] 462 ]
463 deps += [
464 "//third_party/nss:nspr",
465 "//third_party/nss",
466 ]
davidben 2014/09/23 00:48:38 These and similar are redundant with the //crypto:
467 } else { # !is_win 463 } else { # !is_win
468 sources -= [ 464 sources -= [
469 "base/winsock_init.cc", 465 "base/winsock_init.cc",
470 "base/winsock_init.h", 466 "base/winsock_init.h",
471 "base/winsock_util.cc", 467 "base/winsock_util.cc",
472 "base/winsock_util.h", 468 "base/winsock_util.h",
473 "proxy/proxy_resolver_winhttp.cc", 469 "proxy/proxy_resolver_winhttp.cc",
474 "proxy/proxy_resolver_winhttp.h", 470 "proxy/proxy_resolver_winhttp.h",
475 ] 471 ]
476 } 472 }
477 473
478 if (is_mac) { 474 if (is_mac) {
479 deps += [
480 "//third_party/nss:nspr",
481 "//third_party/nss",
482 ]
483 libs = [ 475 libs = [
484 "Foundation.framework", 476 "Foundation.framework",
485 "Security.framework", 477 "Security.framework",
486 "SystemConfiguration.framework", 478 "SystemConfiguration.framework",
487 "resolv", 479 "resolv",
488 ] 480 ]
489 } 481 }
490 482
491 if (is_ios) { 483 if (is_ios) {
492 # Add back some sources that were otherwise filtered out. iOS additionally 484 # Add back some sources that were otherwise filtered out. iOS additionally
493 # doesn't set USE_NSS but needs some of the files. 485 # doesn't set USE_NSS but needs some of the files.
494 set_sources_assignment_filter([]) 486 set_sources_assignment_filter([])
495 sources += [ 487 sources += [
496 "base/network_change_notifier_mac.cc", 488 "base/network_change_notifier_mac.cc",
497 "base/network_config_watcher_mac.cc", 489 "base/network_config_watcher_mac.cc",
498 "base/platform_mime_util_mac.mm", 490 "base/platform_mime_util_mac.mm",
499 "cert/cert_verify_proc_nss.cc", 491 "cert/cert_verify_proc_nss.cc",
500 "cert/cert_verify_proc_nss.h", 492 "cert/cert_verify_proc_nss.h",
501 "cert/test_root_certs_nss.cc", 493 "cert/test_root_certs_nss.cc",
502 "cert/x509_util_nss.cc", 494 "cert/x509_util_nss.cc",
503 "cert/x509_util_nss.h", 495 "cert/x509_util_nss.h",
504 "proxy/proxy_resolver_mac.cc", 496 "proxy/proxy_resolver_mac.cc",
505 "proxy/proxy_server_mac.cc", 497 "proxy/proxy_server_mac.cc",
506 "ocsp/nss_ocsp.cc", 498 "ocsp/nss_ocsp.cc",
507 "ocsp/nss_ocsp.h", 499 "ocsp/nss_ocsp.h",
508 ] 500 ]
509 set_sources_assignment_filter(sources_assignment_filter) 501 set_sources_assignment_filter(sources_assignment_filter)
510 502
511 sources -= [ "disk_cache/blockfile/file_posix.cc" ] 503 sources -= [ "disk_cache/blockfile/file_posix.cc" ]
512 deps += [
513 "//third_party/nss",
514 ]
515 libs = [ 504 libs = [
516 "CFNetwork.framework", 505 "CFNetwork.framework",
517 "MobileCoreServices.framework", 506 "MobileCoreServices.framework",
518 "Security.framework", 507 "Security.framework",
519 "SystemConfiguration.framework", 508 "SystemConfiguration.framework",
520 "resolv", 509 "resolv",
521 ] 510 ]
522 } 511 }
523 512
524 if (is_android) { 513 if (is_android) {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 "//base", 690 "//base",
702 "//base/test:test_support", 691 "//base/test:test_support",
703 "//crypto", 692 "//crypto",
704 "//net", 693 "//net",
705 "//net/tools/tld_cleanup", 694 "//net/tools/tld_cleanup",
706 "//testing/gmock", 695 "//testing/gmock",
707 "//testing/gtest", 696 "//testing/gtest",
708 "//url", 697 "//url",
709 ] 698 ]
710 699
711 if (is_ios) { 700 if (!use_openssl && (use_nss_certs || is_ios)) {
davidben 2014/09/23 00:48:38 net/cert/ev_root_ca_metadata.cc
712 deps += [ "//third_party/nss" ] 701 deps += ["//crypto:platform" ]
713 } 702 }
714 703
715 if (!is_android) { 704 if (!is_android) {
716 sources -= [ 705 sources -= [
717 "test/spawned_test_server/remote_test_server.cc", 706 "test/spawned_test_server/remote_test_server.cc",
718 "test/spawned_test_server/remote_test_server.h", 707 "test/spawned_test_server/remote_test_server.h",
719 "test/spawned_test_server/spawner_communicator.cc", 708 "test/spawned_test_server/spawner_communicator.cc",
720 "test/spawned_test_server/spawner_communicator.h", 709 "test/spawned_test_server/spawner_communicator.h",
721 ] 710 ]
722 } 711 }
723 712
724 if (use_v8_in_net) { 713 if (use_v8_in_net) {
725 deps += [ ":net_with_v8" ] 714 deps += [ ":net_with_v8" ]
726 } 715 }
727 716
728 if (!enable_mdns) { 717 if (!enable_mdns) {
729 sources -= [ 718 sources -= [
730 "dns/mock_mdns_socket_factory.cc", 719 "dns/mock_mdns_socket_factory.cc",
731 "dns/mock_mdns_socket_factory.h", 720 "dns/mock_mdns_socket_factory.h",
732 ] 721 ]
733 } 722 }
734 723
735 if (use_nss_certs) { 724 if (!use_nss_certs) {
736 deps += ["//crypto:platform" ]
737 } else {
738 sources -= [ 725 sources -= [
739 "test/cert_test_util_nss.cc", 726 "test/cert_test_util_nss.cc",
740 ] 727 ]
741 } 728 }
742 729
743 forward_dependent_configs_from = deps 730 forward_dependent_configs_from = deps
744 } 731 }
745 732
746 source_set("balsa") { 733 source_set("balsa") {
747 sources = [ 734 sources = [
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 sources = [ "quic/quic_server_bin.cc" ] 1377 sources = [ "quic/quic_server_bin.cc" ]
1391 deps = [ 1378 deps = [
1392 ":quic_tools", 1379 ":quic_tools",
1393 ":net", 1380 ":net",
1394 "//base", 1381 "//base",
1395 "//third_party/boringssl", 1382 "//third_party/boringssl",
1396 ] 1383 ]
1397 } 1384 }
1398 1385
1399 } # !is_android 1386 } # !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