Revert 87309 - Second attempt to fix linux redux builder

Numerous targets were depending on linux/system.gyp:nss even on the openssl build and the gyp update means it shows up as a link error.

BUG=None
TEST=Builds with and without use_openssl=1

Review URL: http://codereview.chromium.org/7050040

TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/7054041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87315 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 43 insertions, 32 deletions

diff --git a/base/base.gyp b/base/base.gyp
index c1bdcb3..db1cd99 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -262,7 +262,7 @@
           ],
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }, {  # toolkit_uses_gtk!=1
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 92240d3..587f31d 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -74,17 +74,12 @@
       }]]
     },
     {
-      'target_name': 'ssl',
+      'target_name': 'nss',
       'type': 'settings',
       'conditions': [
         ['_toolset=="target"', {
           'conditions': [
-            ['use_openssl==1', {
-              'dependencies': [
-                '../../third_party/openssl/openssl.gyp:openssl',
-              ],
-            }],
-            ['use_openssl==0 and use_system_ssl==0', {
+            ['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)',
                 ],
               },
-            }],
-          ]
+            }
+          ]]
         }],
       ],
     },
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index abbc724..9211d76 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3667,7 +3667,7 @@
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
-            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:nss',
             '../build/linux/system.gyp:x11',
             '../third_party/undoview/undoview.gyp:undoview',
           ],
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2b0b24a..3a0953a 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -377,8 +377,18 @@
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac"', {
-            'dependencies': [
-              '../build/linux/system.gyp:ssl',
+            'conditions': [
+              ['use_openssl==1', {
+                 'dependencies': [
+                   '../third_party/openssl/openssl.gyp:openssl',
+                 ],
+               },
+               { # else !use_openssl
+                'dependencies': [
+                  '../build/linux/system.gyp:nss',
+                ],
+               },
+              ],
             ],
           },
           {  # else: OS is not in the above list
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 73fd01b..497e83c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -215,7 +215,7 @@
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:nss',
           ],
         }],
         ['OS=="win"', {
@@ -476,7 +476,7 @@
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
@@ -2027,7 +2027,7 @@
           ],
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
@@ -2571,7 +2571,7 @@
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources': [
@@ -3212,7 +3212,7 @@
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:nss',
             'packed_resources'
           ],
         }],
@@ -3336,7 +3336,7 @@
         ['toolkit_uses_gtk == 1', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
-             '../build/linux/system.gyp:ssl',
+             '../build/linux/system.gyp:nss',
            ],
         }],
         ['OS=="mac"', {
@@ -3484,7 +3484,7 @@
         ['toolkit_uses_gtk == 1', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
-             '../build/linux/system.gyp:ssl',
+             '../build/linux/system.gyp:nss',
            ],
         }],
         ['toolkit_views==1', {
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index 02ef8e1..e662e52 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -19,17 +19,24 @@
       ],
       '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/': [
@@ -195,7 +202,7 @@
             ],
           ],
           'dependencies': [
-            '../build/linux/system.gyp:ssl',
+            '../build/linux/system.gyp:nss',
           ],
         }, {  # os_posix != 1 or OS == "mac"
           'sources!': [
diff --git a/net/net.gyp b/net/net.gyp
index 4c9603e..e757129 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -741,7 +741,7 @@
               },
               {  # else use_openssl==0, use NSS
                 'dependencies': [
-                  '../build/linux/system.gyp:ssl',
+                  '../build/linux/system.gyp:nss',
                 ],
               }],
             ],
@@ -999,7 +999,7 @@
         [ 'toolkit_uses_gtk == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gtk',
-              '../build/linux/system.gyp:ssl',
+              '../build/linux/system.gyp:nss',
             ],
           },
           {  # else: OS is not in the above list
@@ -1175,7 +1175,7 @@
               ],
             }, {
               'dependencies': [
-                '../build/linux/system.gyp:ssl',
+                '../build/linux/system.gyp:nss',
               ],
             }],
           ],