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

crypto/crypto.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': [
     {
       'target_name': 'crypto',
       'product_name': 'crcrypto',  # Avoid colliding with OpenSSL's libcrypto
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
       ],
       'msvs_disabled_warnings': [
         4018,
       ],
       'conditions': [
         [ 'os_posix == 1 and OS != "mac"', {
+          'dependencies': [
+            '../build/linux/system.gyp:ssl',
+          ],
+          'export_dependent_settings': [
+            '../build/linux/system.gyp:ssl',
+          ],
           'conditions': [
             [ 'chromeos==1', {
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
               },
             ],
-            [ 'use_openssl==1', {
-                'dependencies': [
-                  '../third_party/openssl/openssl.gyp:openssl',
-                ],
-              }, {  # use_openssl==0
-                'dependencies': [
-                  '../build/linux/system.gyp:nss',
-                ],
-                'export_dependent_settings': [
-                  '../build/linux/system.gyp:nss',
-                ],
-              }
-            ],
           ],
         }, {  # os_posix != 1 or OS == "mac"
             'sources/': [
               ['exclude', '_nss\.cc$'],
             ],
         }],
         [ 'OS == "freebsd" or OS == "openbsd"', {
           'link_settings': {
             'libraries': [
               '-L/usr/local/lib -lexecinfo',
@@ skipping 145 matching lines @@
         [ 'os_posix == 1 and OS != "mac"', {
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
           'dependencies': [
-            '../build/linux/system.gyp:nss',
+            '../build/linux/system.gyp:ssl',
           ],
         }, {  # os_posix != 1 or OS == "mac"
           'sources!': [
             'rsa_private_key_nss_unittest.cc',
           ]
         }],
         [ 'OS == "mac" or OS == "win"', {
           'dependencies': [
             '../third_party/nss/nss.gyp:nss',
           ],
         }],
         [ 'use_openssl==1', {
           'sources!': [
             'rsa_private_key_nss_unittest.cc',
           ],
         }],
       ],
     },
   ],
 }