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

build/linux/system.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.
 
 {
   'conditions': [
     ['sysroot!=""', {
       'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
       },
@@ skipping 56 matching lines @@
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-unix-print-2.0)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)',
             ],
           },
       }]]
     },
     {
-      'target_name': 'nss',
+      'target_name': 'ssl',
       'type': 'settings',
       'conditions': [
         ['_toolset=="target"', {
           'conditions': [
-            ['use_system_ssl==0', {
+            ['use_openssl==1', {
+              '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',
               ],
               'direct_dependent_settings': {
                 'cflags': [
                   # We need for our local copies of the libssl3 headers to come
                   # first, otherwise the code will build, but will fallback to
                   # the set of features advertised in the system headers.
                   # Unfortunately, there's no include path that we can filter
                   # out of $(pkg-config --cflags nss) and GYP include paths
                   # come after cflags on the command line. So we have these
                   # bodges:
                   '-Inet/third_party/nss/ssl',                         # for make
                   '-ISource/WebKit/chromium/net/third_party/nss/ssl',  # for make in webkit
                   '<!@(<(pkg-config) --cflags nss)',
                 ],
               },
               'link_settings': {
                 'ldflags': [
                   '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
                 ],
                 'libraries': [
                   '<!@(<(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)',
                 ],
                 'defines': [
                   'USE_SYSTEM_SSL',
                 ],
               },
               'link_settings': {
                 'ldflags': [
                   '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
                 ],
                 'libraries': [
                   '<!@(<(pkg-config) --libs-only-l nss)',
                 ],
               },
-            }
-          ]]
+            }],
+          ]
         }],
       ],
     },
     {
       'target_name': 'freetype2',
       'type': 'settings',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
@@ skipping 286 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: