diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-21 18:21:58 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-21 18:21:58 +0000 |
| commit | f146e310e20b8ba18787fad990d30ccc9f537168 (patch) | |
| tree | 45d2d0b0c78b4b52909ac95d3272f639df88a297 /webkit/build/JavaScriptCore | |
| parent | 4e8a5ad81d4ab7b6db935367fbefaef7817959e7 (diff) | |
| download | chromium_src-f146e310e20b8ba18787fad990d30ccc9f537168.zip chromium_src-f146e310e20b8ba18787fad990d30ccc9f537168.tar.gz chromium_src-f146e310e20b8ba18787fad990d30ccc9f537168.tar.bz2 | |
WebKit Merge 39972:40057, Chromium side.
R=jeremy
Review URL: http://codereview.chromium.org/18608
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index e691d31..16b228d 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -146,7 +146,7 @@ if env.Bit('windows'): ) wtf_inputs = [ - '$JAVASCRIPTCORE_DIR/runtime/ByteArray.cpp', + '$WTF_DIR/ByteArray.cpp', '$WTF_DIR/Assertions.cpp', '$WTF_DIR/CurrentTime.cpp', '$WTF_DIR/dtoa.cpp', diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index baf5d8c..7515ad7 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -138,11 +138,11 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.cpp" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ByteArray.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.h" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ByteArray.h" > </File> <File |