diff options
| author | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 22:11:35 +0000 |
|---|---|---|
| committer | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 22:11:35 +0000 |
| commit | dec7b17e7308a19743191c04f900927e6df32fda (patch) | |
| tree | 4d746852b6f6543cb1c04bcec6a2676c3967497b /webkit/tools | |
| parent | a7df090aade662f45baacd5e7907885c0f8a2c71 (diff) | |
| download | chromium_src-dec7b17e7308a19743191c04f900927e6df32fda.zip chromium_src-dec7b17e7308a19743191c04f900927e6df32fda.tar.gz chromium_src-dec7b17e7308a19743191c04f900927e6df32fda.tar.bz2 | |
Upstreamings parts of webkit.gyp (step 3)
This is step 3 a multi-step process that is part of the webkit chromium port.
This step includes:
A. Removal of features.gypi, webcore.gyp and javascriptcore.gyp. All three now live upstream on webkit.
B. Changing downstream dependencies to point at new upstream gyp files.
Remaining steps:
* Implement a mechanism to allow downstream override of upstream features.gypi. Will be part of the
upstream chromium build mechanism.
Review URL: http://codereview.chromium.org/212050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index cc497eb..7ff875b 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -464,7 +464,7 @@ ], 'dependencies': [ '../../../third_party/npapi/npapi.gyp:npapi', - '../../javascriptcore.gyp:wtf', + '../../../third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', ], 'msvs_disabled_warnings': [ 4996 ], 'mac_bundle_resources': [ |