Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (128298 => 128299)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-12 12:33:23 UTC (rev 128298)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-12 12:43:40 UTC (rev 128299)
@@ -1,3 +1,20 @@
+2012-09-12 Philippe Liard <pli...@google.com>
+
+ Depend on {base,net} GYP targets rather than {base,net}_java.
+ https://bugs.webkit.org/show_bug.cgi?id=95690
+
+ Reviewed by Adam Barth.
+
+ {base,net}_java became 'private' targets on the Chromium side that
+ clients should not depend on (see
+ https://chromiumcodereview.appspot.com/10913083/).
+ This also adds the missing 'chromium_net.jar' to |input_jars_paths|
+ that was magically included in Chrome for Android downstream but not
+ upstream. It's needed to register JNI for 'net' in webkit_unit_tests.
+
+
+ * WebKitUnitTests.gyp:
+
2012-09-12 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r128279.
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (128298 => 128299)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-09-12 12:33:23 UTC (rev 128298)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-09-12 12:43:40 UTC (rev 128299)
@@ -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)',
Modified: trunk/Tools/ChangeLog (128298 => 128299)
--- trunk/Tools/ChangeLog 2012-09-12 12:33:23 UTC (rev 128298)
+++ trunk/Tools/ChangeLog 2012-09-12 12:43:40 UTC (rev 128299)
@@ -1,3 +1,19 @@
+2012-09-12 Philippe Liard <pli...@google.com>
+
+ Depend on {base,net} GYP targets rather than {base,net}_java.
+ https://bugs.webkit.org/show_bug.cgi?id=95690
+
+ Reviewed by Adam Barth.
+
+ {base,net}_java became 'private' targets on the Chromium side that
+ clients should not depend on (see
+ https://chromiumcodereview.appspot.com/10913083/).
+ This removes a bunch of trailing white spaces additionally in
+ TestWebkitAPI.gyp (which includes non-trailing white space changes).
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
+
2012-09-12 Simon Hausmann <simon.hausm...@nokia.com>
[Qt] Fix the build with ENABLE_NETSCAPE_PLUGIN_API=0
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (128298 => 128299)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-09-12 12:33:23 UTC (rev 128298)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-09-12 12:43:40 UTC (rev 128299)
@@ -452,9 +452,9 @@
'target_name': 'DumpRenderTree_apk',
'type': 'none',
'dependencies': [
- '<(chromium_src_dir)/base/base.gyp:base_java',
- '<(chromium_src_dir)/net/net.gyp:net_java',
+ '<(chromium_src_dir)/base/base.gyp:base',
'<(chromium_src_dir)/media/media.gyp:media_java',
+ '<(chromium_src_dir)/net/net.gyp:net',
'DumpRenderTree',
],
'variables': {
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp (128298 => 128299)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-09-12 12:33:23 UTC (rev 128298)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-09-12 12:43:40 UTC (rev 128299)
@@ -50,38 +50,38 @@
'../../../Source/WebKit/chromium/features.gypi',
],
'targets': [
- {
- 'target_name': 'TestWebKitAPI',
- 'type': 'executable',
- 'dependencies': [
- '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit',
- '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf',
+ {
+ 'target_name': 'TestWebKitAPI',
+ 'type': 'executable',
+ 'dependencies': [
+ '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit',
+ '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
- '<(chromium_src_dir)/base/base.gyp:test_support_base',
- '<(chromium_src_dir)/testing/gtest.gyp:gtest',
- '<(chromium_src_dir)/testing/gmock.gyp:gmock',
- '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
- ],
- 'include_dirs': [
- '<(tools_dir)/TestWebKitAPI',
- # Needed by tests/RunAllTests.cpp, as well as ChromiumCurrentTime.cpp and
- # ChromiumThreading.cpp in chromium shared library configuration.
- '<(source_dir)/WebKit/chromium/public',
- ],
- 'sources': [
- # Reuse the same testing driver of Chromium's webkit_unit_tests.
- '<(source_dir)/WebKit/chromium/tests/RunAllTests.cpp',
- '<@(TestWebKitAPI_files)',
- ],
- 'conditions': [
- ['inside_chromium_build==1 and component=="shared_library"', {
- 'sources': [
- # To satisfy linking of WTF::currentTime() etc. in shared library configuration,
- # as the symbols are not exported from the DLLs.
- '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
- '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp',
- ],
+ '<(chromium_src_dir)/base/base.gyp:test_support_base',
+ '<(chromium_src_dir)/testing/gtest.gyp:gtest',
+ '<(chromium_src_dir)/testing/gmock.gyp:gmock',
+ '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
+ ],
+ 'include_dirs': [
+ '<(tools_dir)/TestWebKitAPI',
+ # Needed by tests/RunAllTests.cpp, as well as ChromiumCurrentTime.cpp and
+ # ChromiumThreading.cpp in chromium shared library configuration.
+ '<(source_dir)/WebKit/chromium/public',
+ ],
+ 'sources': [
+ # Reuse the same testing driver of Chromium's webkit_unit_tests.
+ '<(source_dir)/WebKit/chromium/tests/RunAllTests.cpp',
+ '<@(TestWebKitAPI_files)',
+ ],
+ 'conditions': [
+ ['inside_chromium_build==1 and component=="shared_library"', {
+ 'sources': [
+ # To satisfy linking of WTF::currentTime() etc. in shared library configuration,
+ # as the symbols are not exported from the DLLs.
+ '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
+ '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp',
+ ],
}],
['OS=="android" and gtest_target_type == "shared_library"', {
'type': 'shared_library',
@@ -90,7 +90,7 @@
],
}],
],
- },
+ },
], # targets
'conditions': [
['OS=="android" and gtest_target_type == "shared_library"', {
@@ -99,7 +99,7 @@
'target_name': 'TestWebKitAPI_apk',
'type': 'none',
'dependencies': [
- '<(chromium_src_dir)/base/base.gyp:base_java',
+ '<(chromium_src_dir)/base/base.gyp:base',
'TestWebKitAPI',
],
'variables': {
