Changeset 128299 in webkit
- Timestamp:
- Sep 12, 2012 5:43:40 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r128284 r128299 1 2012-09-12 Philippe Liard <pliard@google.com> 2 3 Depend on {base,net} GYP targets rather than {base,net}_java. 4 https://bugs.webkit.org/show_bug.cgi?id=95690 5 6 Reviewed by Adam Barth. 7 8 {base,net}_java became 'private' targets on the Chromium side that 9 clients should not depend on (see 10 https://chromiumcodereview.appspot.com/10913083/). 11 This also adds the missing 'chromium_net.jar' to |input_jars_paths| 12 that was magically included in Chrome for Android downstream but not 13 upstream. It's needed to register JNI for 'net' in webkit_unit_tests. 14 15 16 * WebKitUnitTests.gyp: 17 1 18 2012-09-12 Sheriff Bot <webkit.review.bot@gmail.com> 2 19 -
trunk/Source/WebKit/chromium/WebKitUnitTests.gyp
r127691 r128299 146 146 'type': 'none', 147 147 'dependencies': [ 148 '<(chromium_src_dir)/base/base.gyp:base_java', 148 '<(chromium_src_dir)/base/base.gyp:base', 149 '<(chromium_src_dir)/net/net.gyp:net', 149 150 'webkit_unit_tests', 150 151 ], … … 153 154 'input_jars_paths': [ 154 155 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 156 '<(PRODUCT_DIR)/lib.java/chromium_net.jar', 155 157 ], 156 158 'conditions': [ … … 172 174 '<(chromium_src_dir)/testing/android/generate_native_test.py', 173 175 '<(input_shlib_path)', 174 ' <@(input_jars_paths)',176 '>@(input_jars_paths)', 175 177 ], 176 178 'outputs': [ … … 182 184 '<(input_shlib_path)', 183 185 '--jars', 184 '" <@(input_jars_paths)"',186 '">@(input_jars_paths)"', 185 187 '--output', 186 188 '<(PRODUCT_DIR)/webkit_unit_tests_apk', -
trunk/Tools/ChangeLog
r128297 r128299 1 2012-09-12 Philippe Liard <pliard@google.com> 2 3 Depend on {base,net} GYP targets rather than {base,net}_java. 4 https://bugs.webkit.org/show_bug.cgi?id=95690 5 6 Reviewed by Adam Barth. 7 8 {base,net}_java became 'private' targets on the Chromium side that 9 clients should not depend on (see 10 https://chromiumcodereview.appspot.com/10913083/). 11 This removes a bunch of trailing white spaces additionally in 12 TestWebkitAPI.gyp (which includes non-trailing white space changes). 13 14 * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: 15 * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp: 16 1 17 2012-09-12 Simon Hausmann <simon.hausmann@nokia.com> 2 18 -
trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
r128232 r128299 453 453 'type': 'none', 454 454 'dependencies': [ 455 '<(chromium_src_dir)/base/base.gyp:base_java', 456 '<(chromium_src_dir)/net/net.gyp:net_java', 455 '<(chromium_src_dir)/base/base.gyp:base', 457 456 '<(chromium_src_dir)/media/media.gyp:media_java', 457 '<(chromium_src_dir)/net/net.gyp:net', 458 458 'DumpRenderTree', 459 459 ], -
trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp
r127430 r128299 51 51 ], 52 52 'targets': [ 53 { 54 'target_name': 'TestWebKitAPI', 55 'type': 'executable', 56 'dependencies': [ 57 '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit', 58 '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf', 53 { 54 'target_name': 'TestWebKitAPI', 55 'type': 'executable', 56 'dependencies': [ 57 '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit', 58 '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf', 59 59 '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', 60 60 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', 61 '<(chromium_src_dir)/base/base.gyp:test_support_base', 62 '<(chromium_src_dir)/testing/gtest.gyp:gtest', 63 '<(chromium_src_dir)/testing/gmock.gyp:gmock', 64 '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support', 65 ], 66 'include_dirs': [ 67 '<(tools_dir)/TestWebKitAPI', 68 # Needed by tests/RunAllTests.cpp, as well as ChromiumCurrentTime.cpp and 69 # ChromiumThreading.cpp in chromium shared library configuration. 70 '<(source_dir)/WebKit/chromium/public', 71 ], 72 'sources': [ 73 # Reuse the same testing driver of Chromium's webkit_unit_tests. 74 '<(source_dir)/WebKit/chromium/tests/RunAllTests.cpp', 75 '<@(TestWebKitAPI_files)', 76 ], 77 'conditions': [ 78 ['inside_chromium_build==1 and component=="shared_library"', { 79 'sources': [ 80 # To satisfy linking of WTF::currentTime() etc. in shared library configuration, 81 # as the symbols are not exported from the DLLs. 82 '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp', 83 '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp', 84 ], 61 '<(chromium_src_dir)/base/base.gyp:test_support_base', 62 '<(chromium_src_dir)/testing/gtest.gyp:gtest', 63 '<(chromium_src_dir)/testing/gmock.gyp:gmock', 64 '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support', 65 ], 66 'include_dirs': [ 67 '<(tools_dir)/TestWebKitAPI', 68 # Needed by tests/RunAllTests.cpp, as well as ChromiumCurrentTime.cpp and 69 # ChromiumThreading.cpp in chromium shared library configuration. 70 '<(source_dir)/WebKit/chromium/public', 71 ], 72 'sources': [ 73 # Reuse the same testing driver of Chromium's webkit_unit_tests. 74 '<(source_dir)/WebKit/chromium/tests/RunAllTests.cpp', 75 '<@(TestWebKitAPI_files)', 76 ], 77 'conditions': [ 78 ['inside_chromium_build==1 and component=="shared_library"', { 79 'sources': [ 80 # To satisfy linking of WTF::currentTime() etc. in shared library configuration, 81 # as the symbols are not exported from the DLLs. 82 '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp', 83 '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp', 84 ], 85 85 }], 86 86 ['OS=="android" and gtest_target_type == "shared_library"', { … … 91 91 }], 92 92 ], 93 }, 93 }, 94 94 ], # targets 95 95 'conditions': [ … … 100 100 'type': 'none', 101 101 'dependencies': [ 102 '<(chromium_src_dir)/base/base.gyp:base _java',102 '<(chromium_src_dir)/base/base.gyp:base', 103 103 'TestWebKitAPI', 104 104 ],
Note: See TracChangeset
for help on using the changeset viewer.