From a7a702c1b5283d4fad6ca02bcbcfaf13009b978e Mon Sep 17 00:00:00 2001
From: "tony@chromium.org"
 <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 24 Aug 2009 22:45:58 +0000
Subject: Revert "linux: call g_thread_init() at relevant startup points"

This reverts commit r24148 because the FDRemapping unittest is failing.

TBR=evanm

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


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24168 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/linux/system.gyp | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index e10c905..68b52be 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -9,15 +9,15 @@
       'type': 'settings',
       'direct_dependent_settings': {
         'cflags': [
-          '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)',
+          '<!@(pkg-config --cflags gtk+-2.0)',
         ],
       },
       'link_settings': {
         'ldflags': [
-          '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
+          '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0)',
         ],
         'libraries': [
-          '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
+          '<!@(pkg-config --libs-only-l gtk+-2.0)',
         ],
       },
     },
@@ -107,6 +107,23 @@
       },
     },
     {
+      'target_name': 'gthread',
+      'type': 'settings',
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(pkg-config --cflags gthread-2.0)',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(pkg-config --libs-only-L --libs-only-other gthread-2.0)',
+        ],
+        'libraries': [
+          '<!@(pkg-config --libs-only-l gthread-2.0)',
+        ],
+      },
+    },
+    {
       'target_name': 'x11',
       'type': 'settings',
       'direct_dependent_settings': {
-- 
cgit v1.1