diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 17:39:10 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 17:39:10 +0000 |
| commit | 1b5ee8c34493a5a2384c309620eb45389efb7a42 (patch) | |
| tree | a432aa8aa9eb2e93fc9f1fb90e9c6fc3d70395bb /webkit/SConscript | |
| parent | 7f90db5bd9b8fcc8b440a338ca049d1819d6fee9 (diff) | |
| download | chromium_src-1b5ee8c34493a5a2384c309620eb45389efb7a42.zip chromium_src-1b5ee8c34493a5a2384c309620eb45389efb7a42.tar.gz chromium_src-1b5ee8c34493a5a2384c309620eb45389efb7a42.tar.bz2 | |
Switch over to using the image decoders from third_party/WebKit
R=dglazkov
Review URL: http://codereview.chromium.org/18365
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 8c9a4b0..cda5fb7 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -104,13 +104,6 @@ env.Prepend( # introduced any hidden problems. #'$WEBKIT_DIR/build/JavaScriptCore', - '$WEBKIT_DIR_PORT_INC/platform/image-decoders', - '$WEBKIT_DIR_PORT_INC/platform/image-decoders/bmp', - '$WEBKIT_DIR_PORT_INC/platform/image-decoders/gif', - '$WEBKIT_DIR_PORT_INC/platform/image-decoders/ico', - '$WEBKIT_DIR_PORT_INC/platform/image-decoders/jpeg', - '$WEBKIT_DIR_PORT_INC/platform/image-decoders/png', - '$WEBKIT_DIR_PORT_INC/platform/image-decoders/xbm', '$ZLIB_DIR', '$LIBPNG_DIR', '$LIBJPEG_DIR', @@ -130,20 +123,8 @@ env.Prepend( '$WEBKIT_DIR/pending', '$WEBKIT_DIR_PORT_INC/bindings/v8', - '$WEBKIT_DIR_PORT_INC/css', - '$WEBKIT_DIR_PORT_INC/dom', - '$WEBKIT_DIR_PORT_INC/history', - '$WEBKIT_DIR_PORT_INC/page/chromium', '$WEBKIT_DIR_PORT_INC/platform', - '$WEBKIT_DIR_PORT_INC/platform/animation', - '$WEBKIT_DIR_PORT_INC/platform/chromium', - '$WEBKIT_DIR_PORT_INC/platform/graphics', - '$WEBKIT_DIR_PORT_INC/platform/graphics/chromium', - '$WEBKIT_DIR_PORT_INC/platform/graphics/skia', - '$WEBKIT_DIR_PORT_INC/platform/graphics/transforms', '$WEBKIT_DIR_PORT_INC/platform/$WEBKIT_PLATFORM_SUBDIR', - '$WEBKIT_DIR_PORT_INC/platform/network/chromium', - '$WEBKIT_DIR_PORT_INC/rendering', '$JAVASCRIPTCORE_DIR', '$JAVASCRIPTCORE_DIR/wtf', @@ -152,7 +133,10 @@ env.Prepend( # from. We don't have to list directories that are listed in the # $WEBKIT_DIR_PORT_INC section above because they automatically fall # back to third_party/WebKit/Webcore. + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/css', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/dom', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/editing', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/history', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/html', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader', @@ -161,11 +145,22 @@ env.Prepend( '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader/icon', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/page', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/page/animation', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/page/chromium', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/animation', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/chromium', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/chromium', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/skia', '$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/network', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/network/chromium', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/sql', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/text', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/plugins', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/rendering', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/rendering/style', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/storage', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/style', |