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

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

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 | « chrome/chrome_utility.gypi ('k') | chrome/utility/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/net/BUILD.gn
diff --git a/chrome/common/net/BUILD.gn b/chrome/common/net/BUILD.gn
index b69512ca9d6505ce59904288b74a116c853a4b54..b73de58a0f24044fc3b7c64b72b292a9922a2ba1 100644
--- a/chrome/common/net/BUILD.gn
+++ b/chrome/common/net/BUILD.gn
@@ -30,31 +30,25 @@ static_library("net") {
]
if (is_ios) {
- sources -= [
- "net_resource_provider.cc",
- "x509_certificate_model.cc",
- ]
+ sources -= [ "net_resource_provider.cc" ]
} else {
deps += [ "//gpu/ipc" ]
}
- if (is_win || is_mac || is_ios) {
- sources -= [
- "x509_certificate_model_nss.cc",
- "x509_certificate_model_openssl.cc",
- ]
- } else if (use_openssl) {
- sources -= [ "x509_certificate_model_nss.cc" ]
+ if (is_android || is_ios) {
+ sources -= [ "x509_certificate_model.cc" ]
+ }
+
+ if (use_openssl_certs && !is_android) {
+ deps += [ "//third_party/boringssl" ]
} else {
sources -= [ "x509_certificate_model_openssl.cc" ]
}
- if (is_android) {
- sources -= [
- "x509_certificate_model.cc",
- "x509_certificate_model_openssl.cc",
- ]
- deps += [ "//third_party/boringssl" ]
+ if (use_nss_certs) {
+ deps += [ "//crypto:platform" ]
+ } else {
+ sources -= [ "x509_certificate_model_nss.cc" ]
}
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
« no previous file with comments | « chrome/chrome_utility.gypi ('k') | chrome/utility/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698