| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 365f660c7c50ffa2b02a44b6fcbdeabe3a88933e..7e5520ece21f4d430e7a55f70578242de13e19b5 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%': 1,
|
| + 'use_openssl%': 0,
|
|
|
| # Use OpenSSL for representing certificates. When targeting Android,
|
| # the platform certificate library is used for certificate
|
| @@ -235,9 +235,9 @@
|
| 'enable_topchrome_md%': 1,
|
| }],
|
|
|
| - # On iOS, use NSS rather than OpenSSL. See http://crbug.com/338886.
|
| - ['OS=="ios"', {
|
| - 'use_openssl%': 0,
|
| + # Enable the OpenSSL backend on Mac OS and Windows.
|
| + ['OS=="mac" or OS=="win"', {
|
| + 'use_openssl%': 1,
|
| }],
|
|
|
| # Enable App Launcher everywhere but mobile.
|
| @@ -1805,7 +1805,8 @@
|
| # developer builds, to avoid spurious re-linking of native files.
|
| 'optimize_jni_generation%': '<(optimize_jni_generation)',
|
|
|
| - # Use OpenSSL's struct X509 to represent certificates.
|
| + # Always uses openssl.
|
| + 'use_openssl%': 1,
|
| 'use_openssl_certs%': 1,
|
|
|
| 'proprietary_codecs%': '<(proprietary_codecs)',
|
|
|