diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 18:43:47 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 18:43:47 +0000 |
| commit | b0381b3e193519c009ec812686c9366ecd684f9f (patch) | |
| tree | 706ebd5881ec588be0eddd9eed3b7dc3c6cd62c6 /webkit/SConscript | |
| parent | a6e8bc495bcdb6c1484ea88bb2f8aa03f6603765 (diff) | |
| download | chromium_src-b0381b3e193519c009ec812686c9366ecd684f9f.zip chromium_src-b0381b3e193519c009ec812686c9366ecd684f9f.tar.gz chromium_src-b0381b3e193519c009ec812686c9366ecd684f9f.tar.bz2 | |
Reverting 9394.
Relanding merge for the third time. Darin will fix mac build.
Review URL: http://codereview.chromium.org/20183
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index cda5fb7..92de4bf 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -128,6 +128,7 @@ env.Prepend( '$JAVASCRIPTCORE_DIR', '$JAVASCRIPTCORE_DIR/wtf', + '$JAVASCRIPTCORE_DIR/wtf/chromium', # Directories in third_party/WebKit/Webcore that we pull headers # from. We don't have to list directories that are listed in the @@ -155,6 +156,7 @@ env.Prepend( '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/opentype', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/transforms', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/image-decoders/skia', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/image-encoders/skia', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/network', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/network/chromium', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/sql', |