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

Unified Diff: build/config/BUILD.gn

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more ios Created 5 years, 10 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: build/config/BUILD.gn
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 49b5cfeb6a58ca05cd1c7395d1c67343888ba39a..e98e9f5b96f0c2a6a73e95b28107d36510d137c4 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -114,10 +114,11 @@ config("feature_flags") {
}
if (use_openssl) {
defines += [ "USE_OPENSSL=1" ]
- if (use_openssl_certs) {
- defines += [ "USE_OPENSSL_CERTS=1" ]
- }
- } else if (use_nss_certs) {
+ }
+ if (use_openssl_certs) {
+ defines += [ "USE_OPENSSL_CERTS=1" ]
+ }
+ if (use_nss_certs) {
# USE_NSS really means "use nss for certificate validation and storage"
# (like USE_OPENSSL_CERTS) and not "we're linking to NSS." It might be nice
# to rename this but we're hoping to transition away from NSS.

Powered by Google App Engine
This is Rietveld 408576698