Index: third_party/libjingle/libjingle.gyp |
=================================================================== |
--- third_party/libjingle/libjingle.gyp (revision 160712) |
+++ third_party/libjingle/libjingle.gyp (working copy) |
@@ -131,6 +131,22 @@ |
}, |
}, |
'conditions': [ |
+ ['use_openssl!=1', { |
Ronghua Wu (Left Chromium)
2012/10/15 00:32:22
Changed from "'OS!="android"". Make sense?
Ryan Sleevi
2012/10/15 17:58:39
Change SGTM, but it makes me think that you should
Ronghua Wu (Left Chromium)
2012/10/15 18:06:24
Good point. Done
|
+ 'defines': [ |
+ 'SSL_USE_NSS', |
+ ], |
+ }], |
+ [ 'os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { |
+ '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', |