summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 19:41:43 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 19:41:43 +0000
commita0607da9446e3ec76a7ced32502f8c7e71654d53 (patch)
tree958a5b77aa00de5981641531e683b565c6d5b3cf /base/base.gyp
parent651b77c761749949fc7f148e3c20fe203a61bf7d (diff)
downloadchromium_src-a0607da9446e3ec76a7ced32502f8c7e71654d53.zip
chromium_src-a0607da9446e3ec76a7ced32502f8c7e71654d53.tar.gz
chromium_src-a0607da9446e3ec76a7ced32502f8c7e71654d53.tar.bz2
Revert "POSIX: don't allocate memory after forking."
Appears to break tlslite on the Mac. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp4
1 files changed, 1 insertions, 3 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 30d746d..2eec8e1 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -61,7 +61,7 @@
'crypto/signature_verifier_unittest.cc',
'data_pack_unittest.cc',
'debug_util_unittest.cc',
- 'dir_reader_posix_unittest.cc',
+ 'file_watcher_unittest.cc',
'event_trace_consumer_win_unittest.cc',
'event_trace_controller_win_unittest.cc',
'event_trace_provider_win_unittest.cc',
@@ -70,7 +70,6 @@
'file_path_unittest.cc',
'file_util_unittest.cc',
'file_version_info_unittest.cc',
- 'file_watcher_unittest.cc',
'gfx/rect_unittest.cc',
'gmock_unittest.cc',
'histogram_unittest.cc',
@@ -182,7 +181,6 @@
'../third_party/icu/icu.gyp:icudata',
],
'sources!': [
- 'dir_reader_posix_unittest.cc',
'file_descriptor_shuffle_unittest.cc',
],
}, { # OS != "win"