diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 05:31:30 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 05:31:30 +0000 |
| commit | 7b8852c25003b07434ba027122ff2d3bb3c325f3 (patch) | |
| tree | 6a215b27d6cf9bbbd127a0daa156ceaff10d476e /third_party | |
| parent | a2896a8d08fd58e19b7540374eca3e10a008f001 (diff) | |
| download | chromium_src-7b8852c25003b07434ba027122ff2d3bb3c325f3.zip chromium_src-7b8852c25003b07434ba027122ff2d3bb3c325f3.tar.gz chromium_src-7b8852c25003b07434ba027122ff2d3bb3c325f3.tar.bz2 | |
Roll libjingle 257:262.
BUG=webrtc 850,940 crbug 165326
Review URL: https://chromiumcodereview.appspot.com/11828060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 074a8d7..baf9671 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/libjingle/ Version: unknown -Revision: 257 +Revision: 263 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 8efb866..62a8bb5 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -149,6 +149,8 @@ ], }, { 'defines': [ + 'SSL_USE_NSS', + 'HAVE_NSS_SSL_H', 'SSL_USE_NSS_RNG', ], 'conditions': [ @@ -160,6 +162,7 @@ }], ['OS == "mac" or OS == "ios" or OS == "win"', { 'dependencies': [ + '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', '<(DEPTH)/third_party/nss/nss.gyp:nspr', '<(DEPTH)/third_party/nss/nss.gyp:nss', ], @@ -334,6 +337,8 @@ '<(libjingle_source)/talk/base/socketstream.h', '<(libjingle_source)/talk/base/ssladapter.cc', '<(libjingle_source)/talk/base/ssladapter.h', + '<(libjingle_source)/talk/base/sslidentity.cc', + '<(libjingle_source)/talk/base/sslidentity.h', '<(libjingle_source)/talk/base/sslsocketfactory.cc', '<(libjingle_source)/talk/base/sslsocketfactory.h', '<(libjingle_source)/talk/base/sslstreamadapter.cc', |