diff options
| author | hongchan <hongchan@chromium.org> | 2015-07-14 13:05:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 20:06:49 +0000 |
| commit | fd2634ebfc39feec8210daa1ed1b9d0f8cb6b8b4 (patch) | |
| tree | d825fd146aefc34999c87edaf2351e0371a65763 /build | |
| parent | 7e5f25cdb268f67578f9391a3409e3cddec7663a (diff) | |
| download | chromium_src-fd2634ebfc39feec8210daa1ed1b9d0f8cb6b8b4.zip chromium_src-fd2634ebfc39feec8210daa1ed1b9d0f8cb6b8b4.tar.gz chromium_src-fd2634ebfc39feec8210daa1ed1b9d0f8cb6b8b4.tar.bz2 | |
Revert of Switch Linux and CrOS to BoringSSL. (patchset #8 id:130001 of https://codereview.chromium.org/1210073014/)
Reason for revert:
This CL seems to cause the issue in Chromium build system.
https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/2784
Original issue's description:
> Switch Linux and CrOS to BoringSSL.
>
> If this causes problems, please revert first and ask questions
> later.
>
> BUG=462040
>
> Committed: https://crrev.com/df391ba1d19134bb0a6e895a4a33f1af4932545d
> Cr-Commit-Position: refs/heads/master@{#338713}
TBR=rsleevi@chromium.org,thakis@chromium.org,davidben@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=462040
Review URL: https://codereview.chromium.org/1235673005
Cr-Commit-Position: refs/heads/master@{#338725}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 11 | ||||
| -rw-r--r-- | build/config/crypto.gni | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index cc48129..67eb8ac 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. @@ -1804,7 +1804,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)', diff --git a/build/config/crypto.gni b/build/config/crypto.gni index 90a45ea..4d42a37 100644 --- a/build/config/crypto.gni +++ b/build/config/crypto.gni @@ -12,9 +12,10 @@ # to set up feature flags. declare_args() { - # Use OpenSSL instead of NSS. This is used for all platforms but iOS. (See - # http://crbug.com/338886). - use_openssl = !is_ios + # Use OpenSSL instead of NSS. This is used for Android, Mac, NaCl untrusted + # code, and Windows, and is experimental in other cases (see + # http://crbug.com/62803). + use_openssl = is_android || is_mac || is_nacl || is_win } # True when we're using OpenSSL for representing certificates. When targeting |