generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add schannel webrtc_base build using a new use_schannel gyp variable.

Browse Source 
R=henrike@webrtc.org, thorcarpenter@google.com

Review URL: https://webrtc-codereview.appspot.com/28409004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7141 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tpsiaki@google.com 2014-09-10 18:06:47 +00:00
parent b2efb6771c
commit 67eabc0938
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/base/base.gyp
View File

@ -500,6 +500,8 @@
}], }],
], ],
}, { }, {
'conditions': [
['use_legacy_ssl_defaults!=1', {
'defines': [ 'defines': [
'SSL_USE_NSS', 'SSL_USE_NSS',
'HAVE_NSS_SSL_H', 'HAVE_NSS_SSL_H',
@ -513,6 +515,8 @@
], ],
}, },
}], }],
],
}],
['OS == "android"', { ['OS == "android"', {
'defines': [ 'defines': [
'HAVE_OPENSSL_SSL_H' 'HAVE_OPENSSL_SSL_H'
@ -529,16 +533,20 @@
], ],
}, },
}, { }, {
'conditions': [
['use_legacy_ssl_defaults!=1', {
'defines': [ 'defines': [
'HAVE_NSS_SSL_H' 'HAVE_NSS_SSL_H',
'SSL_USE_NSS_RNG', 'SSL_USE_NSS_RNG',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'defines': [ 'defines': [
'HAVE_NSS_SSL_H' 'HAVE_NSS_SSL_H',
'SSL_USE_NSS_RNG', 'SSL_USE_NSS_RNG',
], ],
}, },
}],
],
'sources!': [ 'sources!': [
'ifaddrs-android.cc', 'ifaddrs-android.cc',
'ifaddrs-android.h', 'ifaddrs-android.h',

5
webrtc/build/common.gypi
View File

@ -118,6 +118,11 @@
# https://gcc.gnu.org/wiki/LinkTimeOptimization # https://gcc.gnu.org/wiki/LinkTimeOptimization
'use_lto%': 0, 'use_lto%': 0,
# Defer ssl perference to that specified through sslconfig.h instead of
# choosing openssl or nss directly. In practice, this can be used to
# enable schannel on windows.
'use_legacy_ssl_defaults%': 0,
'conditions': [ 'conditions': [
['build_with_chromium==1', { ['build_with_chromium==1', {
# Exclude pulse audio on Chromium since its prerequisites don't require # Exclude pulse audio on Chromium since its prerequisites don't require