diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz | |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp')
| -rw-r--r-- | Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp index f04708322..8277ce35f 100644 --- a/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp +++ b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp @@ -464,6 +464,13 @@ '<(PRODUCT_DIR)/lib.java/chromium_net.jar', '<(PRODUCT_DIR)/lib.java/chromium_media.jar', ], + 'conditions': [ + ['inside_chromium_build==1', { + 'ant_build_to_chromium_src': '<(ant_build_out)/../../', + }, { + 'ant_build_to_chromium_src': '<(chromium_src_dir)', + }], + ], }, # Part of the following was copied from <(chromium_src_dir)/build/apk_test.gpyi. # Not including it because gyp include doesn't support variable in path or under @@ -488,6 +495,7 @@ '"<@(input_jars_paths)"', '--output', '<(PRODUCT_DIR)/DumpRenderTree_apk', + '--strip-binary=<(android_strip)', '--ant-args', '-DANDROID_SDK=<(android_sdk)', '--ant-args', @@ -500,6 +508,8 @@ '-DANDROID_TOOLCHAIN=<(android_toolchain)', '--ant-args', '-DPRODUCT_DIR=<(ant_build_out)', + '--ant-args', + '-DCHROMIUM_SRC=<(ant_build_to_chromium_src)', '--sdk-build=<(sdk_build)', '--app_abi', '<(android_app_abi)', |