summaryrefslogtreecommitdiffstats
path: root/build/linux/system.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-18 13:51:03 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-18 13:51:03 +0000
commita9283efe53b14a504a6a5be842f3dd199c2729bf (patch)
tree11f050a519d44c306d3fffe84a1329201dd5722f /build/linux/system.gyp
parent933cc2e2d4f2335ffec0a90ddf714f5ef416c78f (diff)
downloadchromium_src-a9283efe53b14a504a6a5be842f3dd199c2729bf.zip
chromium_src-a9283efe53b14a504a6a5be842f3dd199c2729bf.tar.gz
chromium_src-a9283efe53b14a504a6a5be842f3dd199c2729bf.tar.bz2
Switch to BoringSSL.
(This is a reland of r283813 which was reverted in r283845 because it broke WebRTC tests on Android. That, in turn, was a reland of 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=none Review URL: https://codereview.chromium.org/401613008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux/system.gyp')
-rw-r--r--build/linux/system.gyp2
1 files changed, 1 insertions, 1 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', {