diff options
| author | davidben <davidben@chromium.org> | 2014-09-29 11:24:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 18:24:20 +0000 |
| commit | 15d69d48ff5e91b7c6855f495ec2d2b2bed51f06 (patch) | |
| tree | 6c6d2ae0cb8eb2cf3ec2e7bad448f45a3b435d44 /net/BUILD.gn | |
| parent | b34c55a6d60b5941fa54e2b214533cf8e5377675 (diff) | |
| download | chromium_src-15d69d48ff5e91b7c6855f495ec2d2b2bed51f06.zip chromium_src-15d69d48ff5e91b7c6855f495ec2d2b2bed51f06.tar.gz chromium_src-15d69d48ff5e91b7c6855f495ec2d2b2bed51f06.tar.bz2 | |
Only depend on NSS in one place.
Control with use_openssl, not with per-platform special-cases.
BUG=416683
Review URL: https://codereview.chromium.org/569683003
Cr-Commit-Position: refs/heads/master@{#297211}
Diffstat (limited to 'net/BUILD.gn')
| -rw-r--r-- | net/BUILD.gn | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/net/BUILD.gn b/net/BUILD.gn index d7dce72..70bc62a 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -458,10 +458,6 @@ component("net") { "udp/udp_socket_libevent.cc", "udp/udp_socket_libevent.h", ] - deps += [ - "//third_party/nss:nspr", - "//third_party/nss", - ] } else { # !is_win sources -= [ "base/winsock_init.cc", @@ -474,12 +470,6 @@ component("net") { } if (is_mac) { - if (!use_openssl) { - deps += [ - "//third_party/nss:nspr", - "//third_party/nss", - ] - } libs = [ "Foundation.framework", "Security.framework", @@ -509,9 +499,6 @@ component("net") { set_sources_assignment_filter(sources_assignment_filter) sources -= [ "disk_cache/blockfile/file_posix.cc" ] - deps += [ - "//third_party/nss", - ] libs = [ "CFNetwork.framework", "MobileCoreServices.framework", @@ -708,8 +695,8 @@ source_set("test_support") { "//url", ] - if (is_ios) { - public_deps += [ "//third_party/nss" ] + if (!use_openssl && (use_nss_certs || is_ios)) { + public_deps += ["//crypto:platform" ] } if (!is_android) { @@ -732,9 +719,7 @@ source_set("test_support") { ] } - if (use_nss_certs) { - public_deps += ["//crypto:platform" ] - } else { + if (!use_nss_certs) { sources -= [ "test/cert_test_util_nss.cc", ] |