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

Unified Diff: chrome/common/net/BUILD.gn

Issue 552983004: Pull buildtools to get GN 295140 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: chrome/common/net/BUILD.gn
diff --git a/chrome/common/net/BUILD.gn b/chrome/common/net/BUILD.gn
index dd3502aa61c92349736b7e7cf49475103fa38f1d..84c5c486f4c94faa4b2dd81e6e3e3a4a63f49046 100644
--- a/chrome/common/net/BUILD.gn
+++ b/chrome/common/net/BUILD.gn
@@ -44,6 +44,10 @@ static_library("net") {
"x509_certificate_model_nss.cc",
"x509_certificate_model_openssl.cc",
]
+ } else if (use_openssl) {
+ sources -= [ "x509_certificate_model_nss.cc" ]
+ } else {
+ sources -= [ "x509_certificate_model_openssl.cc" ]
}
if (is_android) {
@@ -54,18 +58,6 @@ static_library("net") {
deps += [ "//third_party/boringssl" ]
}
- if (use_openssl) {
- # networking_private_crypto.cc uses NSS functions.
- sources -= [
- "x509_certificate_model_nss.cc",
- ]
- } else if (is_linux) {
- # Already removed for non-Linux cases above.
- sources -= [
- "x509_certificate_model_openssl.cc",
- ]
- }
-
if (is_win) {
cflags = [ "/wd4267" ]
}

Powered by Google App Engine
This is Rietveld 408576698