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

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

Issue 236713002: Implement net in GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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/net.gypi ('k') | net/tools/tld_cleanup/BUILD.gn » ('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 03385f64c16f100aa7285072b901cdc8d91cb1eb..cf52e473ec88a264d20b9bd54a2fb220dabf16f9 100644
--- a/net/third_party/nss/ssl/BUILD.gn
+++ b/net/third_party/nss/ssl/BUILD.gn
@@ -57,7 +57,7 @@ component("libssl") {
"bodge/secitem_array.c",
]
- direct_dependent_settings = [ ":ssl_config" ]
+ direct_dependent_configs = [ ":ssl_config" ]
cflags = []
defines = [
@@ -83,7 +83,9 @@ component("libssl") {
include_dirs = [ "bodge" ]
- direct_dependent_configs = [
+ # Must be after ssl_config since we want our SSL headers to take
+ # precedence.
+ direct_dependent_configs += [
"//third_party/nss:system_nss_no_ssl_config"
]
} else if (is_mac) {
« no previous file with comments | « net/net.gypi ('k') | net/tools/tld_cleanup/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698