diff options
| author | davidben <davidben@chromium.org> | 2014-09-12 08:11:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 15:13:27 +0000 |
| commit | 71c13e6ac01d5cdc49ca40e8e9301d5142d85018 (patch) | |
| tree | e2cebabd51261dd2a7f82bd3f768e017de249464 /third_party | |
| parent | cbdb6d62787e1562ad23bb5517d31b698c6babad (diff) | |
| download | chromium_src-71c13e6ac01d5cdc49ca40e8e9301d5142d85018.zip chromium_src-71c13e6ac01d5cdc49ca40e8e9301d5142d85018.tar.gz chromium_src-71c13e6ac01d5cdc49ca40e8e9301d5142d85018.tar.bz2 | |
Reland dd7edfa67: Switch Mac over to BoringSSL from NSS.
This is a reland of dd7edfa67 which was reverted in 80a9a88f4c for build
failures. It also includes a BoringSSL roll and build changes to avoid adding a
static initializer.
This is a much much larger change than the diff suggests. If it breaks
something, please revert first and ask questions later.
BUG=338885
TBR=brettw
Review URL: https://codereview.chromium.org/568643003
Cr-Commit-Position: refs/heads/master@{#294589}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/boringssl/BUILD.gn | 5 | ||||
| -rw-r--r-- | third_party/boringssl/boringssl.gyp | 5 | ||||
| -rw-r--r-- | third_party/boringssl/boringssl.gypi | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn index 7337461..3b7f91a 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -31,7 +31,10 @@ component("boringssl") { direct_dependent_configs = [ ":openssl_config" ] cflags = [] - defines = [ "BORINGSSL_IMPLEMENTATION" ] + defines = [ + "BORINGSSL_IMPLEMENTATION", + "BORINGSSL_NO_STATIC_INITIALIZER", + ] if (is_component_build) { defines += [ "BORINGSSL_SHARED_LIBRARY", diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp index 2fd1653..f18e333 100644 --- a/third_party/boringssl/boringssl.gyp +++ b/third_party/boringssl/boringssl.gyp @@ -13,7 +13,10 @@ 'sources': [ '<@(boringssl_lib_sources)', ], - 'defines': [ 'BORINGSSL_IMPLEMENTATION' ], + 'defines': [ + 'BORINGSSL_IMPLEMENTATION', + 'BORINGSSL_NO_STATIC_INITIALIZER', + ], 'conditions': [ ['component == "shared_library"', { 'defines': [ diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi index a562c28..39beb3f 100644 --- a/third_party/boringssl/boringssl.gypi +++ b/third_party/boringssl/boringssl.gypi @@ -100,6 +100,7 @@ 'src/crypto/conf/conf_error.c', 'src/crypto/cpu-arm.c', 'src/crypto/cpu-intel.c', + 'src/crypto/crypto.c', 'src/crypto/crypto_error.c', 'src/crypto/des/des.c', 'src/crypto/dh/check.c', |