diff options
| author | davidben <davidben@chromium.org> | 2014-09-10 14:20:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-10 21:25:44 +0000 |
| commit | dd7edfa679492a6feb3ef2e1630f05da82a1b31f (patch) | |
| tree | c442272ff382f9529f6004d26c8e8bbeb729dfd9 /build | |
| parent | 11bb859312e520f71a291971bb2ee7bcb30a9a43 (diff) | |
| download | chromium_src-dd7edfa679492a6feb3ef2e1630f05da82a1b31f.zip chromium_src-dd7edfa679492a6feb3ef2e1630f05da82a1b31f.tar.gz chromium_src-dd7edfa679492a6feb3ef2e1630f05da82a1b31f.tar.bz2 | |
Switch Mac over to BoringSSL from NSS.
This is a much much larger change than the diff suggests. If it breaks
something, please revert first and ask questions later.
BUG=338885
Review URL: https://codereview.chromium.org/539163002
Cr-Commit-Position: refs/heads/master@{#294233}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 5 | ||||
| -rw-r--r-- | build/config/crypto.gni | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index dc38c4b..33e4144 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -205,6 +205,11 @@ 'enable_hidpi%': 1, }], + # Enable the OpenSSL backend on Mac OS. + ['OS=="mac"', { + 'use_openssl%': 1, + }], + # Enable App Launcher everywhere but mobile. ['OS!="ios" and OS!="android"', { 'enable_app_list%': 1, diff --git a/build/config/crypto.gni b/build/config/crypto.gni index 1837754..20004c3 100644 --- a/build/config/crypto.gni +++ b/build/config/crypto.gni @@ -8,9 +8,9 @@ # the global build dependency on it should be removed. declare_args() { - # Use OpenSSL instead of NSS. This is used for Android and NaCl untrusted + # Use OpenSSL instead of NSS. This is used for Android, Mac, and NaCl untrusted # code, and is experimental in other cases (see http://crbug.com/62803). - use_openssl = is_android || is_nacl + use_openssl = is_android || is_mac || is_nacl } # True when we're using OpenSSL for certificate verification and storage. We |