summaryrefslogtreecommitdiffstats
path: root/crypto/crypto_nacl.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-17 17:59:10 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-17 17:59:10 +0000
commit2126ceff10266d71675244ba89c6a7951cfb3d8b (patch)
tree8d161378853a3ac9965098fd3da3f7ff1511ce24 /crypto/crypto_nacl.gyp
parent791733d3dbc0dc80ba00b70a8c18ebaf2c2af812 (diff)
downloadchromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.zip
chromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.tar.gz
chromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.tar.bz2
Switch to BoringSSL.
(This is a reland of r283542 which was reverted in r283591 because it broke the WebView build. The android_aosp trybots are broken[1] so this based on hope.) This is a much larger change than its diff suggests. If it breaks something, please revert first and ask questions later. [1] http://code.google.com/p/chromium/issues/detail?id=394597 BUG=none Review URL: https://codereview.chromium.org/399993002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto_nacl.gyp')
-rw-r--r--crypto/crypto_nacl.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/crypto_nacl.gyp b/crypto/crypto_nacl.gyp
index 6ec5e83..4451610 100644
--- a/crypto/crypto_nacl.gyp
+++ b/crypto/crypto_nacl.gyp
@@ -22,7 +22,7 @@
'build_pnacl_newlib': 1,
},
'dependencies': [
- '../third_party/openssl/openssl_nacl.gyp:openssl_nacl',
+ '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
'../native_client/tools.gyp:prep_toolchain',
'../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
],