commit 67eabc0938ebb7e505c76b6d25fbaa2de5c83e4c
author tpsiaki@google.com <tpsiaki@google.com> Wed Sep 10 18:06:47 2014 +0000
committer tpsiaki@google.com <tpsiaki@google.com> Wed Sep 10 18:06:47 2014 +0000
tree 2d0fc2ab5914f6ca0ef8d1905e6f7ea6b0fca1eb
parent b2efb6771c3a5c492d8005a72b3c69cc18d1b408

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

diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index a17c979..6c9fd0e 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',

webrtc/build/common.gypi

diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 6a911f8..bc88d4a 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