diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 18:20:37 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 18:20:37 +0000 |
| commit | edfd0f43f597524764f6cb6988f6d52cc3d5a815 (patch) | |
| tree | 8d04cf46384f60e33b16e45a91865fcae291fee3 /build | |
| parent | 6a565f0f33da0eb60371a5be8980b521f6b1980a (diff) | |
| download | chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.zip chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.tar.gz chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.tar.bz2 | |
Switch to BoringSSL.
This is a reland of r284079 which was reverted in r284248 for components build
issues. That, in turn, was a reland of r283813 which was reverted in r283845
because it broke WebRTC tests on Android. That, in turn, was a reland of
r283542 which was reverted in r283591 because it broke the WebView build.
This is a much larger change than its diff suggests. If it breaks
something, please revert first and ask questions later.
BUG=393317
R=agl@chromium.org, jam@chromium.org
Review URL: https://codereview.chromium.org/401153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/system.gyp | 2 | ||||
| -rwxr-xr-x | build/linux/unbundle/replace_gyp_files.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 59c31a6..d81b8d4 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -985,7 +985,7 @@ 'conditions': [ ['use_openssl==1', { 'dependencies': [ - '../../third_party/openssl/openssl.gyp:openssl', + '../../third_party/boringssl/boringssl.gyp:boringssl', ], }], ['use_openssl==0', { diff --git a/build/linux/unbundle/replace_gyp_files.py b/build/linux/unbundle/replace_gyp_files.py index 28ab14f..fc7646f 100755 --- a/build/linux/unbundle/replace_gyp_files.py +++ b/build/linux/unbundle/replace_gyp_files.py @@ -31,7 +31,7 @@ REPLACEMENTS = { 'use_system_libxml': 'third_party/libxml/libxml.gyp', 'use_system_libxnvctrl' : 'third_party/libXNVCtrl/libXNVCtrl.gyp', 'use_system_libxslt': 'third_party/libxslt/libxslt.gyp', - 'use_system_openssl': 'third_party/openssl/openssl.gyp', + 'use_system_openssl': 'third_party/boringssl/boringssl.gyp', 'use_system_opus': 'third_party/opus/opus.gyp', 'use_system_re2': 'third_party/re2/re2.gyp', 'use_system_snappy': 'third_party/snappy/snappy.gyp', |