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

Issues Search
    My Issues | Starred     Open | Closed | All

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
« net/net.gypi ('K') | « net/net.gypi ('k') | net/tools/tld_cleanup/BUILD.gn » ('j') | net/tools/tld_cleanup/BUILD.gn » ('J')
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 fef95165836fe81d979b799cf6f55941e108449c..7b1377de29da88a62ed3f60493129b6ab485a301 100644
--- a/net/third_party/nss/ssl/BUILD.gn
+++ b/net/third_party/nss/ssl/BUILD.gn
@@ -68,7 +68,7 @@ component("libssl") {
"bodge/secitem_array.c",
]
- direct_dependent_settings = [ ":ssl_config" ]
+ direct_dependent_configs = [ ":ssl_config" ]
cflags = []
defines = [
@@ -94,7 +94,9 @@ component("libssl") {
include_dirs = [ "bodge" ]
- direct_dependent_configs = [ ":ssl_pkg_config" ]
+ # Must be after ssl_config since we want our SSL headers to take
+ # precedence.
+ direct_dependent_configs += [ ":ssl_pkg_config" ]
} else if (is_mac) {
libs = [ "Security.framework" ]
}
« net/net.gypi ('K') | « net/net.gypi ('k') | net/tools/tld_cleanup/BUILD.gn » ('j') | net/tools/tld_cleanup/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698