Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1333)

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 11093061: Enable peerconnection to use the NSS RNG. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/nss_ssl_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
===================================================================
--- third_party/libjingle/libjingle.gyp (revision 160712)
+++ third_party/libjingle/libjingle.gyp (working copy)
@@ -131,6 +131,24 @@
},
},
'conditions': [
+ ['use_openssl!=1', {
+ 'defines': [
+ 'SSL_USE_NSS',
+ ],
+ 'conditions': [
+ [ 'os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
Sergey Ulanov 2012/10/15 23:09:13 nit: 80-char lines
Ronghua Wu (Left Chromium) 2012/10/15 23:40:39 Done.
+ 'dependencies': [
+ '<(DEPTH)/build/linux/system.gyp:ssl',
+ ],
+ }],
+ [ 'OS == "mac" or OS == "ios" or OS == "win"', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/nss/nss.gyp:nspr',
+ '<(DEPTH)/third_party/nss/nss.gyp:nss',
+ ],
+ }],
+ ],
+ }],
['OS=="win"', {
'include_dirs': [
'../third_party/platformsdk_win7/files/Include',
« no previous file with comments | « net/socket/nss_ssl_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698