diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-22 09:07:43 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-22 09:07:43 +0000 |
| commit | 292cdc751c17c6bd61c677d9da6bacf6f10a5bcb (patch) | |
| tree | f64a56464f7f45eb79e9531d18123d25919ce01e /third_party | |
| parent | c26c4f8e58ce2dbf5f5910bb07a708f0a570680c (diff) | |
| download | chromium_src-292cdc751c17c6bd61c677d9da6bacf6f10a5bcb.zip chromium_src-292cdc751c17c6bd61c677d9da6bacf6f10a5bcb.tar.gz chromium_src-292cdc751c17c6bd61c677d9da6bacf6f10a5bcb.tar.bz2 | |
Roll libjingle 235:244 and webrtc 3088:3138
TBR=wez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11412141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
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', ], |