summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-24 23:27:11 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-24 23:27:11 +0000
commit6466e2cedc3398c6bbf8227c5a2c8c1cb9253a75 (patch)
tree68fa3542f422b3298286829a69cf337a1e434d21 /chrome/chrome.gyp
parent1ef1023581b9f58105864d771cc4cdbe45a29532 (diff)
downloadchromium_src-6466e2cedc3398c6bbf8227c5a2c8c1cb9253a75.zip
chromium_src-6466e2cedc3398c6bbf8227c5a2c8c1cb9253a75.tar.gz
chromium_src-6466e2cedc3398c6bbf8227c5a2c8c1cb9253a75.tar.bz2
Revert "POSIX: Don't spawn zombies." (r14488)
Something else is trying to reap children in the ui_tests and causing a mess. Reverting since it's a Friday night. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index fa9d7fd..8ccab4d 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -250,8 +250,7 @@
'common/pref_names.h',
'common/pref_service.cc',
'common/pref_service.h',
- 'common/process_watcher_posix.cc',
- 'common/process_watcher_win.cc',
+ 'common/process_watcher.cc',
'common/process_watcher.h',
'common/property_bag.cc',
'common/property_bag.h',
@@ -347,6 +346,7 @@
'common/classfactory.cc',
'common/drag_drop_types.cc',
'common/os_exchange_data.cc',
+ 'common/process_watcher.cc',
],
}],
],