summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-10 23:28:46 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-10 23:28:46 +0000
commitac577490a5c20950f63d655de37058dc41486e99 (patch)
treee5a53f6cad3317c2451f8ef39bf0b19bd8706e79 /base/base.gyp
parent0f1169993f28f8da9be5a81496fb2e2abf311387 (diff)
downloadchromium_src-ac577490a5c20950f63d655de37058dc41486e99.zip
chromium_src-ac577490a5c20950f63d655de37058dc41486e99.tar.gz
chromium_src-ac577490a5c20950f63d655de37058dc41486e99.tar.bz2
Revert 18109, 18111: Windows UI tests failed.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp9
1 files changed, 6 insertions, 3 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 96deb53..5d09098 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -133,8 +133,6 @@
'fix_wp64.h',
'float_util.h',
'foundation_utils_mac.h',
- 'global_descriptors_posix.h',
- 'global_descriptors_posix.cc',
'hash_tables.h',
'histogram.cc',
'histogram.h',
@@ -326,7 +324,6 @@
'tracked_objects.cc',
'tracked_objects.h',
'tuple.h',
- 'unix_domain_socket_posix.cc',
'values.cc',
'values.h',
'version.cc',
@@ -421,6 +418,9 @@
# so use idle_timer_none.cc instead.
'idle_timer.cc',
],
+ 'sources': [
+ 'zygote_manager.cc',
+ ],
'dependencies': [
'../build/util/build_util.gyp:lastchange',
'../build/linux/system.gyp:gtk',
@@ -685,6 +685,9 @@
],
'conditions': [
['OS == "linux"', {
+ 'sources': [
+ 'zygote_manager_unittest.cc',
+ ],
'sources!': [
'file_version_info_unittest.cc',
# Linux has an implementation of idle_timer, but it's unclear