diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 13:51:03 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 13:51:03 +0000 |
| commit | a9283efe53b14a504a6a5be842f3dd199c2729bf (patch) | |
| tree | 11f050a519d44c306d3fffe84a1329201dd5722f /remoting/remoting_nacl.gyp | |
| parent | 933cc2e2d4f2335ffec0a90ddf714f5ef416c78f (diff) | |
| download | chromium_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 'remoting/remoting_nacl.gyp')
| -rw-r--r-- | remoting/remoting_nacl.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp index c2598c9..0dd96b1 100644 --- a/remoting/remoting_nacl.gyp +++ b/remoting/remoting_nacl.gyp @@ -108,7 +108,7 @@ '../third_party/libvpx/libvpx_nacl.gyp:libvpx_nacl', '../third_party/libwebm/libwebm_nacl.gyp:libwebm_nacl', '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl', - '../third_party/openssl/openssl_nacl.gyp:openssl_nacl', + '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl', '../third_party/opus/opus_nacl.gyp:opus_nacl', 'remoting_proto_nacl', 'remoting_webrtc_nacl', @@ -160,7 +160,7 @@ '>(tc_lib_dir_pnacl_newlib)/libjingle_p2p_constants_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libmedia_yuv_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libmodp_b64_nacl.a', - '>(tc_lib_dir_pnacl_newlib)/libopenssl_nacl.a', + '>(tc_lib_dir_pnacl_newlib)/libboringssl_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libopus_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libppapi.a', '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a', @@ -196,7 +196,7 @@ '../third_party/libwebm/libwebm_nacl.gyp:libwebm_nacl', '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl', '../third_party/modp_b64/modp_b64_nacl.gyp:modp_b64_nacl', - '../third_party/openssl/openssl_nacl.gyp:openssl_nacl', + '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl', '../url/url_nacl.gyp:url_nacl', 'remoting_client_plugin_lib_nacl', 'remoting_proto_nacl', @@ -227,7 +227,7 @@ '-lexpat_nacl', '-lmodp_b64_nacl', '-lopus_nacl', - '-lopenssl_nacl', + '-lboringssl_nacl', '-licui18n_nacl', '-licuuc_nacl', '-licudata_nacl', |