diff options
| author | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-24 17:48:56 +0000 |
|---|---|---|
| committer | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-24 17:48:56 +0000 |
| commit | 45e705d6c706e1cd6995363339f544ba21a1389e (patch) | |
| tree | 81811d62a9f2b9b44c1bf5778961a7369d7d0053 /third_party | |
| parent | d45e93c1197957dd119b5f46e2028581674c11b1 (diff) | |
| download | chromium_src-45e705d6c706e1cd6995363339f544ba21a1389e.zip chromium_src-45e705d6c706e1cd6995363339f544ba21a1389e.tar.gz chromium_src-45e705d6c706e1cd6995363339f544ba21a1389e.tar.bz2 | |
Roll libjingle 235:244 and webrtc 3088:3160
Review URL: https://chromiumcodereview.appspot.com/11415127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169389 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 | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 676a4dd..003f95d59 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication. Short Name: libjingle URL: http://code.google.com/p/libjingle/ Version: unknown -Revision: 235 +Revision: 244 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index a1cb409..061477e 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -138,7 +138,14 @@ }, }, 'conditions': [ - ['use_openssl!=1', { + ['use_openssl==1', { + 'defines': [ + 'SSL_USE_OPENSSL', + ], + 'dependencies': [ + '../../third_party/openssl/openssl.gyp:openssl', + ], + }, { 'defines': [ 'SSL_USE_NSS_RNG', ], |