summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 17:33:32 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 17:33:32 +0000
commit402e79a703cc62b290e0963a258e540b2b356a8a (patch)
treea53740622e93a89a60fdf05b19d6187b8b2932cf /chrome/chrome.gyp
parent9291ed107d2031cea55f324431ffee8d7bae1416 (diff)
downloadchromium_src-402e79a703cc62b290e0963a258e540b2b356a8a.zip
chromium_src-402e79a703cc62b290e0963a258e540b2b356a8a.tar.gz
chromium_src-402e79a703cc62b290e0963a258e540b2b356a8a.tar.bz2
Fixes a couple gyp configuration issues with ipc_tests.
Adds ipc/ipc.gyp:* to the windows-only 'pull_in_all' target in chrome.gyp so that it's built on the windows builders and removes the dependency from unit_tests onto ipc/ipc.gyp:ipc_tests. Renames file_descriptor_set_unittest.cc to file_descriptor_set_posix_unittest.cc to match the .h/.cc files and so that it gets picked up by the exclusion filter properly. (Patch from James Robinson) http://codereview.chromium.org/159272 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index bf184df..ae71889 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3615,9 +3615,6 @@
'utility',
'../app/app.gyp:app_resources',
'../ipc/ipc.gyp:ipc',
- # TODO(jamesr): this is required for the release builders to build
- # ipc_tests.exe. However, it's probably not what we really want.
- '../ipc/ipc.gyp:ipc_tests',
'../net/net.gyp:net_resources',
'../net/net.gyp:net_test_support',
'../printing/printing.gyp:printing',
@@ -4451,6 +4448,7 @@
'installer/installer.gyp:*',
'../app/app.gyp:*',
'../base/base.gyp:*',
+ '../ipc/ipc.gyp:*',
'../media/media.gyp:*',
'../net/net.gyp:*',
'../printing/printing.gyp:*',