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

Unified 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, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index d7dce723ae289dbda45d947704eb132e0efd2c0f..70bc62a4e7254431241f385302ee8634b73826b8 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",
]
« 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