diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 11:37:01 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 11:37:01 +0000 |
| commit | 1543aa2584cc0f3fefd2267cfd42251809afe152 (patch) | |
| tree | 43e6413e57e63dc5d892fca1f0f4da682a846cef /build/all.gyp | |
| parent | abafb0bf768ed3c903bbfdf0a509c3ca869eb3c9 (diff) | |
| download | chromium_src-1543aa2584cc0f3fefd2267cfd42251809afe152.zip chromium_src-1543aa2584cc0f3fefd2267cfd42251809afe152.tar.gz chromium_src-1543aa2584cc0f3fefd2267cfd42251809afe152.tar.bz2 | |
Rolling back webkit-gyp switch. r14382
Review URL: http://codereview.chromium.org/99182
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 99e8cd2..1c79811 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -39,8 +39,6 @@ '../third_party/npapi/npapi.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', - '../webkit/tools/test_shell/test_shell.gyp:*', - '../webkit/webkit.gyp:*', 'temp_gyp/googleurl.gyp:*', ], 'conditions': [ @@ -70,6 +68,8 @@ ['all_gyps', { 'dependencies': [ '../chrome/chrome.gyp:*', + '../webkit/tools/test_shell/test_shell.gyp:*', + '../webkit/webkit.gyp:*', ], }], ], |