diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 23:18:18 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 23:18:18 +0000 |
| commit | 996856a1c8a7c7871c81797dc621a4659213d80c (patch) | |
| tree | a19f5f1a4f62a7d200e985a8d574e4319cc5d888 /build/linux | |
| parent | cf8508be64153d78f4aa5883c6221c0a3335fb2c (diff) | |
| download | chromium_src-996856a1c8a7c7871c81797dc621a4659213d80c.zip chromium_src-996856a1c8a7c7871c81797dc621a4659213d80c.tar.gz chromium_src-996856a1c8a7c7871c81797dc621a4659213d80c.tar.bz2 | |
Revert "Switch to BoringSSL."
This reverts commit r284079.
BUG=395271
Review URL: https://codereview.chromium.org/406693004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -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 d81b8d4..59c31a6 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -985,7 +985,7 @@ 'conditions': [ ['use_openssl==1', { 'dependencies': [ - '../../third_party/boringssl/boringssl.gyp:boringssl', + '../../third_party/openssl/openssl.gyp:openssl', ], }], ['use_openssl==0', { diff --git a/build/linux/unbundle/replace_gyp_files.py b/build/linux/unbundle/replace_gyp_files.py index fc7646f..28ab14f 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/boringssl/boringssl.gyp', + 'use_system_openssl': 'third_party/openssl/openssl.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', |