diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-18 15:53:33 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-18 15:53:33 +0200 |
| commit | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (patch) | |
| tree | d9c68d1cca0b3e352f1e438561f3e504e641a08f /Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp | |
| parent | d0424a769059c84ae20beb3c217812792ea6726b (diff) | |
| download | qtwebkit-6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2.tar.gz | |
Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886)
New snapshot with various build fixes
Diffstat (limited to 'Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp')
| -rw-r--r-- | Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp index 8e3347ca8..131d40f02 100644 --- a/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp +++ b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp @@ -285,12 +285,21 @@ '<(chromium_src_dir)/testing/android/native_test.gyp:native_test_native_code', '<(chromium_src_dir)/tools/android/forwarder/forwarder.gyp:forwarder', '<(chromium_src_dir)/tools/android/md5sum/md5sum.gyp:md5sum', + '<(source_dir)/WebKit/chromium/WebKitUnitTests.gyp:io_stream_forwarder_android', ], 'dependencies!': [ 'ImageDiff', 'copy_TestNetscapePlugIn', '<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa', ], + # FIXME: Remove when the io_stream_forwarder_android target is deprecated. + 'conditions': [ + ['inside_chromium_build==1', { + 'include_dirs': [ + '<(source_dir)/WebKit/chromium/', + ], + }], + ], 'copies': [{ 'destination': '<(PRODUCT_DIR)', 'files': [ |