Revert 87309 - Second attempt to fix linux redux builder

build/linux/system.gyp

Index: build/linux/system.gyp
===================================================================
--- build/linux/system.gyp	(revision 87314)
+++ build/linux/system.gyp	(working copy)
@@ -74,18 +74,13 @@
       }]]
     },
     {
-      'target_name': 'ssl',
+      'target_name': 'nss',
       'type': 'settings',
       'conditions': [
         ['_toolset=="target"', {
           'conditions': [
-            ['use_openssl==1', {
+            ['use_system_ssl==0', {
               'dependencies': [
-                '../../third_party/openssl/openssl.gyp:openssl',
-              ],
-            }],
-            ['use_openssl==0 and use_system_ssl==0', {
-              'dependencies': [
                 '../../net/third_party/nss/ssl.gyp:ssl',
                 '../../third_party/zlib/zlib.gyp:zlib',
               ],
@@ -111,8 +106,7 @@
                   '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
                 ],
               },
-            }],
-            ['use_openssl==0 and use_system_ssl==1', {
+            }, {
               'direct_dependent_settings': {
                 'cflags': [
                   '<!@(<(pkg-config) --cflags nss)',
@@ -129,8 +123,8 @@
                   '<!@(<(pkg-config) --libs-only-l nss)',
                 ],
               },
-            }],
-          ]
+            }
+          ]]
         }],
       ],
     },