Partially merge r177090 for crbug.com/169131.

third_party/libjingle/libjingle.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'variables': {
     'enabled_libjingle_device_manager%': 0,
@@ skipping 130 matching lines @@
       ['use_openssl==1', {
         'defines': [
           'SSL_USE_OPENSSL',
           'HAVE_OPENSSL_SSL_H',
         ],
         'dependencies': [
           '../../third_party/openssl/openssl.gyp:openssl',
         ],
       }, {
         'defines': [
+          'SSL_USE_NSS',
+          'HAVE_NSS_SSL_H',
           'SSL_USE_NSS_RNG',
         ],
         'conditions': [
-          ['os_posix == 1 and OS != "mac" and OS != "ios" and '
-           'OS != "android"', {
+          ['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)/net/third_party/nss/ssl.gyp:libssl',
               '<(DEPTH)/third_party/nss/nss.gyp:nspr',
               '<(DEPTH)/third_party/nss/nss.gyp:nss',
             ],
           }],
         ],
       }],
       ['OS=="win"', {
         'include_dirs': [
           '../third_party/platformsdk_win7/files/Include',
         ],
@@ skipping 147 matching lines @@
         '<(libjingle_source)/talk/base/socketaddresspair.cc',
         '<(libjingle_source)/talk/base/socketaddresspair.h',
         '<(libjingle_source)/talk/base/socketfactory.h',
         '<(libjingle_source)/talk/base/socketpool.cc',
         '<(libjingle_source)/talk/base/socketpool.h',
         '<(libjingle_source)/talk/base/socketserver.h',
         '<(libjingle_source)/talk/base/socketstream.cc',
         '<(libjingle_source)/talk/base/socketstream.h',
         '<(libjingle_source)/talk/base/ssladapter.cc',
         '<(libjingle_source)/talk/base/ssladapter.h',
+        '<(libjingle_source)/talk/base/sslidentity.cc',
+        '<(libjingle_source)/talk/base/sslidentity.h',
         '<(libjingle_source)/talk/base/sslsocketfactory.cc',
         '<(libjingle_source)/talk/base/sslsocketfactory.h',
         '<(libjingle_source)/talk/base/sslstreamadapter.cc',
         '<(libjingle_source)/talk/base/sslstreamadapter.h',
         '<(libjingle_source)/talk/base/sslstreamadapterhelper.cc',
         '<(libjingle_source)/talk/base/sslstreamadapterhelper.h',
         '<(libjingle_source)/talk/base/stream.cc',
         '<(libjingle_source)/talk/base/stream.h',
         '<(libjingle_source)/talk/base/stringencode.cc',
         '<(libjingle_source)/talk/base/stringencode.h',
@@ skipping 445 matching lines @@
             '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<@(libjingle_peerconnection_additional_deps)',
             'libjingle',
             'libjingle_p2p',
           ],
         },  # target libjingle_peerconnection
       ],
     }],
   ],
 }