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

Unified Diff: build/common.gypi

Issue 1210073014: Switch Linux and CrOS to BoringSSL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better comment, try jobs on PS7 Created 5 years, 5 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 | « no previous file | build/config/crypto.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 7e5520ece21f4d430e7a55f70578242de13e19b5..365f660c7c50ffa2b02a44b6fcbdeabe3a88933e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -68,7 +68,7 @@
# implementation. Certificate verification will in most cases be
# handled by the OS. If OpenSSL's struct X509 is used to represent
# certificates, use_openssl_certs must be set.
- 'use_openssl%': 0,
+ 'use_openssl%': 1,
# Use OpenSSL for representing certificates. When targeting Android,
# the platform certificate library is used for certificate
@@ -235,9 +235,9 @@
'enable_topchrome_md%': 1,
}],
- # Enable the OpenSSL backend on Mac OS and Windows.
- ['OS=="mac" or OS=="win"', {
- 'use_openssl%': 1,
+ # On iOS, use NSS rather than OpenSSL. See http://crbug.com/338886.
+ ['OS=="ios"', {
+ 'use_openssl%': 0,
}],
# Enable App Launcher everywhere but mobile.
@@ -1805,8 +1805,7 @@
# developer builds, to avoid spurious re-linking of native files.
'optimize_jni_generation%': '<(optimize_jni_generation)',
- # Always uses openssl.
- 'use_openssl%': 1,
+ # Use OpenSSL's struct X509 to represent certificates.
'use_openssl_certs%': 1,
'proprietary_codecs%': '<(proprietary_codecs)',
« no previous file with comments | « no previous file | build/config/crypto.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698