From 67eabc0938ebb7e505c76b6d25fbaa2de5c83e4c Mon Sep 17 00:00:00 2001 From: "tpsiaki@google.com" Date: Wed, 10 Sep 2014 18:06:47 +0000 Subject: [PATCH] Add schannel webrtc_base build using a new use_schannel gyp variable. 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 --- webrtc/base/base.gyp | 48 +++++++++++++++++++++++----------------- webrtc/build/common.gypi | 5 +++++ 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index a17c97981..6c9fd0e94 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -500,18 +500,22 @@ }], ], }, { - 'defines': [ - 'SSL_USE_NSS', - 'HAVE_NSS_SSL_H', - 'SSL_USE_NSS_RNG', + 'conditions': [ + ['use_legacy_ssl_defaults!=1', { + 'defines': [ + 'SSL_USE_NSS', + 'HAVE_NSS_SSL_H', + 'SSL_USE_NSS_RNG', + ], + 'direct_dependent_settings': { + 'defines': [ + 'SSL_USE_NSS', + 'HAVE_NSS_SSL_H', + 'SSL_USE_NSS_RNG', + ], + }, + }], ], - 'direct_dependent_settings': { - 'defines': [ - 'SSL_USE_NSS', - 'HAVE_NSS_SSL_H', - 'SSL_USE_NSS_RNG', - ], - }, }], ['OS == "android"', { 'defines': [ @@ -529,16 +533,20 @@ ], }, }, { - 'defines': [ - 'HAVE_NSS_SSL_H' - 'SSL_USE_NSS_RNG', + 'conditions': [ + ['use_legacy_ssl_defaults!=1', { + 'defines': [ + 'HAVE_NSS_SSL_H', + 'SSL_USE_NSS_RNG', + ], + 'direct_dependent_settings': { + 'defines': [ + 'HAVE_NSS_SSL_H', + 'SSL_USE_NSS_RNG', + ], + }, + }], ], - 'direct_dependent_settings': { - 'defines': [ - 'HAVE_NSS_SSL_H' - 'SSL_USE_NSS_RNG', - ], - }, 'sources!': [ 'ifaddrs-android.cc', 'ifaddrs-android.h', diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 6a911f88c..bc88d4acd 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -118,6 +118,11 @@ # https://gcc.gnu.org/wiki/LinkTimeOptimization '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': [ ['build_with_chromium==1', { # Exclude pulse audio on Chromium since its prerequisites don't require