diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 06:14:13 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 06:14:13 +0000 |
| commit | d8e1e2e7587c85e7fcf10244fdeaeaa87bb574ce (patch) | |
| tree | 3059ec11258c37aa606566c127a28de98f0c6104 /webkit/webkit.gyp | |
| parent | 4ffe93f472638e325b83e2e0b5e17204032c5964 (diff) | |
| download | chromium_src-d8e1e2e7587c85e7fcf10244fdeaeaa87bb574ce.zip chromium_src-d8e1e2e7587c85e7fcf10244fdeaeaa87bb574ce.tar.gz chromium_src-d8e1e2e7587c85e7fcf10244fdeaeaa87bb574ce.tar.bz2 | |
Change webkit.gyp to pull in test_shell on all platforms.
This way the mac webkit builders can be changed to build webkit.xcodeproj
instead of test_shell.xcodeproj (as is the case for windows).
R=mark
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/549059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 1065494..1c57dc3 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -45,17 +45,10 @@ }, 'targets': [ { - # Currently, builders assume webkit.sln builds test_shell on windows. - # We should change this, but for now allows trybot runs. - # for now. 'target_name': 'pull_in_test_shell', 'type': 'none', - 'conditions': [ - ['OS=="win"', { - 'dependencies': [ - 'tools/test_shell/test_shell.gyp:*', - ], - }], + 'dependencies': [ + 'tools/test_shell/test_shell.gyp:*', ], }, { |