Revert 87315 - Revert 87309 - Second attempt to fix linux redux builder

net/net.gyp

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 723 matching lines @@
               '../build/linux/system.gyp:libresolv',
             ],
             'conditions': [
               ['use_openssl==1', {
                 'dependencies': [
                   '../third_party/openssl/openssl.gyp:openssl',
                 ],
               },
               {  # else use_openssl==0, use NSS
                 'dependencies': [
-                  '../build/linux/system.gyp:nss',
+                  '../build/linux/system.gyp:ssl',
                 ],
               }],
             ],
           },
           {  # else: OS is not in the above list
             'sources!': [
               'base/cert_database_nss.cc',
               'base/crypto_module_nss.cc',
               'base/keygen_handler_nss.cc',
               'base/test_root_certs_nss.cc',
@@ skipping 237 matching lines @@
       ],
       'conditions': [
         ['chromeos==1', {
           'sources!': [
              'proxy/proxy_config_service_linux_unittest.cc',
           ],
         }],
         [ 'toolkit_uses_gtk == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gtk',
-              '../build/linux/system.gyp:nss',
+              '../build/linux/system.gyp:ssl',
             ],
           },
           {  # else: OS is not in the above list
             'sources!': [
               'base/cert_database_nss_unittest.cc',
             ],
           }
         ],
         [ 'os_posix == 1 and OS != "mac"', {
           'conditions': [
@@ skipping 155 matching lines @@
           ],
         }],
         ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
                 '../third_party/openssl/openssl.gyp:openssl',
               ],
             }, {
               'dependencies': [
-                '../build/linux/system.gyp:nss',
+                '../build/linux/system.gyp:ssl',
               ],
             }],
           ],
         }],
         ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
@@ skipping 247 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: