Revert 98885 - Third attempt at the following. Unreviewed, this was originally reviewed in http:...

build/linux/system.gyp

Index: build/linux/system.gyp
===================================================================
--- build/linux/system.gyp	(revision 98916)
+++ build/linux/system.gyp	(working copy)
@@ -31,7 +31,6 @@
     {
       'target_name': 'gtk',
       'type': 'settings',
-      'toolsets': ['host', 'target'],
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
@@ -47,27 +46,12 @@
               '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
             ],
           },
-        }, {
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
-            ],
-            'libraries': [
-              '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
-            ],
-          },
-        }],
-        ['chromeos==1', {
-          'link_settings': {
-            'libraries': [ '-lXtst' ]
-          }
-        }],
-      ],
+      }],
+      [ 'chromeos==1', {
+        'link_settings': {
+          'libraries': [ '-lXtst' ]
+        }
+      }]]
     },
     {
       'target_name': 'gtkprint',
@@ -87,8 +71,7 @@
               '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'ssl',
@@ -165,8 +148,7 @@
               '<!@(<(pkg-config) --libs-only-l freetype2)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'fontconfig',
@@ -186,8 +168,7 @@
               '<!@(<(pkg-config) --libs-only-l fontconfig)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'gdk',
@@ -207,8 +188,7 @@
               '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'gconf',
@@ -231,8 +211,7 @@
               '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'gio',
@@ -267,13 +246,11 @@
               }],
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'x11',
       'type': 'settings',
-      'toolsets': ['host', 'target'],
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
@@ -289,21 +266,7 @@
               '<!@(<(pkg-config) --libs-only-l x11 xi)',
             ],
           },
-        }, {
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(pkg-config --cflags x11)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
-            ],
-            'libraries': [
-              '<!@(pkg-config --libs-only-l x11 xi)',
-            ],
-          },
-        }],
+      }],
       ],
     },
     {
@@ -324,8 +287,7 @@
               '<!@(<(pkg-config) --libs-only-l xext)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'libgcrypt',
@@ -342,8 +304,7 @@
               '<!@(libgcrypt-config --libs)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'selinux',
@@ -355,8 +316,7 @@
               '-lselinux',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'gnome_keyring',