diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 08:54:03 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 08:54:03 +0000 |
| commit | 0c56415492ee3b441ca01d19fc03cb8d7e0b3d6b (patch) | |
| tree | d7e0f0ca4e7eff6c07d210d05e65a3c7271308f2 /build/all.gyp | |
| parent | 81765d34884ea71ab65d7ac4e5de5eafac4afa62 (diff) | |
| download | chromium_src-0c56415492ee3b441ca01d19fc03cb8d7e0b3d6b.zip chromium_src-0c56415492ee3b441ca01d19fc03cb8d7e0b3d6b.tar.gz chromium_src-0c56415492ee3b441ca01d19fc03cb8d7e0b3d6b.tar.bz2 | |
Move the right dependencies into the main section of all.gyp,
the {test_shell,webkit}.gyp:* targets from the 'all_gyps' section,
not the specific 'test_shell' and 'test_shell_tests' targets
from the mac condition.
Review URL: http://codereview.chromium.org/113144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/all.gyp b/build/all.gyp index de2080b..2aad4a3 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -40,8 +40,8 @@ '../third_party/npapi/npapi.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', - '../webkit/tools/test_shell/test_shell.gyp:test_shell', - '../webkit/tools/test_shell/test_shell.gyp:test_shell_tests', + '../webkit/tools/test_shell/test_shell.gyp:*', + '../webkit/webkit.gyp:*', 'temp_gyp/googleurl.gyp:*', ], 'conditions': [ @@ -72,8 +72,6 @@ ['all_gyps', { 'dependencies': [ '../chrome/chrome.gyp:*', - '../webkit/tools/test_shell/test_shell.gyp:*', - '../webkit/webkit.gyp:*', ], }], ], @@ -89,6 +87,8 @@ 'type': 'none', 'dependencies': [ '../chrome/chrome.gyp:image_diff', + '../webkit/tools/test_shell/test_shell.gyp:test_shell', + '../webkit/tools/test_shell/test_shell.gyp:test_shell_tests', ], }, ], |