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

Unified Diff: net/third_party/nss/ssl/BUILD.gn

Issue 1844813002: Uprev NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more GN fix Created 4 years, 8 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 | « net/third_party/nss/ssl.gyp ('k') | net/third_party/nss/ssl/SSLerrs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl/BUILD.gn
diff --git a/net/third_party/nss/ssl/BUILD.gn b/net/third_party/nss/ssl/BUILD.gn
index 1e43806bd06a423cc374812e5347a33d7569a202..06a113d277bc5a38e57ec9a25dc70eb311c64152 100644
--- a/net/third_party/nss/ssl/BUILD.gn
+++ b/net/third_party/nss/ssl/BUILD.gn
@@ -16,7 +16,6 @@ component("libssl") {
sources = [
"SSLerrs.h",
"authcert.c",
- "bodge/secitem_array.c",
"cmpcert.c",
"derive.c",
"dtlscon.c",
@@ -42,7 +41,6 @@ component("libssl") {
"sslmutex.c",
"sslmutex.h",
"sslnonce.c",
- "sslplatf.c",
"sslproto.h",
"sslreveal.c",
"sslsecur.c",
@@ -51,10 +49,12 @@ component("libssl") {
"sslt.h",
"ssltrace.c",
"sslver.c",
+ "tls13con.c",
+ "tls13con.h",
+ "tls13hkdf.c",
+ "tls13hkdf.h",
"unix_err.c",
"unix_err.h",
- "win32err.c",
- "win32err.h",
]
public_configs = [ ":ssl_config" ]
@@ -69,30 +69,6 @@ component("libssl") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
- if (is_win) {
- sources -= [
- "unix_err.c",
- "unix_err.h",
- ]
- if (is_component_build) {
- ldflags = [ "/DEF:" + rebase_path("exports_win.def", root_build_dir) ]
- }
- } else if (is_linux) {
- if (is_component_build) {
- configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
- }
-
- libs = [ "dl" ]
-
- include_dirs = [ "bodge" ]
-
- # Must be after ssl_config since we want our SSL headers to take
- # precedence.
- public_configs += [ "//third_party/nss:system_nss_no_ssl_config" ]
- } else if (is_mac) {
- libs = [ "Security.framework" ]
- }
-
if (is_clang) {
# SSL triggers some of these Clang warnings.
configs -= [ "//build/config/clang:extra_warnings" ]
@@ -108,14 +84,7 @@ component("libssl") {
}
}
- if (is_posix) {
- sources -= [
- "win32err.c",
- "win32err.h",
- ]
- }
-
- if (is_mac || is_ios) {
+ if (is_ios) {
defines += [
"XP_UNIX",
"DARWIN",
@@ -123,8 +92,7 @@ component("libssl") {
]
}
- if (is_mac || is_ios || is_win) {
- sources -= [ "bodge/secitem_array.c" ]
+ if (is_ios) {
public_deps = [
"//third_party/nss:nspr",
"//third_party/nss:nss",
« no previous file with comments | « net/third_party/nss/ssl.gyp ('k') | net/third_party/nss/ssl/SSLerrs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698