diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-14 16:29:47 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-14 16:29:47 +0200 |
| commit | d0424a769059c84ae20beb3c217812792ea6726b (patch) | |
| tree | 6f94a5c3db8c52c6694ee56498542a6c35417350 /Source/WebKit/chromium/WebKitUnitTests.gyp | |
| parent | 88a04ac016f57c2d78e714682445dff2e7db4ade (diff) | |
| download | qtwebkit-d0424a769059c84ae20beb3c217812792ea6726b.tar.gz | |
Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 (http://svn.webkit.org/repository/webkit/trunk@128608)
New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make
Diffstat (limited to 'Source/WebKit/chromium/WebKitUnitTests.gyp')
| -rw-r--r-- | Source/WebKit/chromium/WebKitUnitTests.gyp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebKit/chromium/WebKitUnitTests.gyp b/Source/WebKit/chromium/WebKitUnitTests.gyp index b0f155a74..18adac9f0 100644 --- a/Source/WebKit/chromium/WebKitUnitTests.gyp +++ b/Source/WebKit/chromium/WebKitUnitTests.gyp @@ -145,13 +145,15 @@ 'target_name': 'webkit_unit_tests_apk', 'type': 'none', 'dependencies': [ - '<(chromium_src_dir)/base/base.gyp:base_java', + '<(chromium_src_dir)/base/base.gyp:base', + '<(chromium_src_dir)/net/net.gyp:net', 'webkit_unit_tests', ], 'variables': { 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webkit_unit_tests<(SHARED_LIB_SUFFIX)', 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', + '<(PRODUCT_DIR)/lib.java/chromium_net.jar', ], 'conditions': [ ['inside_chromium_build==1', { @@ -171,7 +173,7 @@ '<(chromium_src_dir)/testing/android/AndroidManifest.xml', '<(chromium_src_dir)/testing/android/generate_native_test.py', '<(input_shlib_path)', - '<@(input_jars_paths)', + '>@(input_jars_paths)', ], 'outputs': [ '<(PRODUCT_DIR)/webkit_unit_tests_apk/webkit_unit_tests-debug.apk', @@ -181,7 +183,7 @@ '--native_library', '<(input_shlib_path)', '--jars', - '"<@(input_jars_paths)"', + '">@(input_jars_paths)"', '--output', '<(PRODUCT_DIR)/webkit_unit_tests_apk', '--strip-binary=<(android_strip)', |