Title: [145355] trunk
- Revision
- 145355
- Author
- commit-qu...@webkit.org
- Date
- 2013-03-11 04:11:49 -0700 (Mon, 11 Mar 2013)
Log Message
[chromium] Android apk targets should depend directly on Java library targets
https://bugs.webkit.org/show_bug.cgi?id=111746
Patch by Chris Hopman <cjhop...@chromium.org> on 2013-03-11
Reviewed by Eric Seidel.
Source/WebKit/chromium:
* WebKitUnitTests.gyp:
Make webkit_unit_tests_apk depend directly on base_java and net_java.
Tools:
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
Make DumpRenderTree_apk depend directly on base_java and net_java.
* TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
Make TestWebKitAPI_apk depend directly on base_java.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (145354 => 145355)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-11 10:56:27 UTC (rev 145354)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-11 11:11:49 UTC (rev 145355)
@@ -1,3 +1,13 @@
+2013-03-11 Chris Hopman <cjhop...@chromium.org>
+
+ [chromium] Android apk targets should depend directly on Java library targets
+ https://bugs.webkit.org/show_bug.cgi?id=111746
+
+ Reviewed by Eric Seidel.
+
+ * WebKitUnitTests.gyp:
+ Make webkit_unit_tests_apk depend directly on base_java and net_java.
+
2013-03-11 Jochen Eisinger <joc...@chromium.org>
[chromium] remove obsolete user gesture methods from WebFrame
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (145354 => 145355)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-03-11 10:56:27 UTC (rev 145354)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-03-11 11:11:49 UTC (rev 145355)
@@ -150,8 +150,8 @@
'target_name': 'webkit_unit_tests_apk',
'type': 'none',
'dependencies': [
- '<(chromium_src_dir)/base/base.gyp:base',
- '<(chromium_src_dir)/net/net.gyp:net',
+ '<(chromium_src_dir)/base/base.gyp:base_java',
+ '<(chromium_src_dir)/net/net.gyp:net_java',
'webkit_unit_tests',
],
'variables': {
Modified: trunk/Tools/ChangeLog (145354 => 145355)
--- trunk/Tools/ChangeLog 2013-03-11 10:56:27 UTC (rev 145354)
+++ trunk/Tools/ChangeLog 2013-03-11 11:11:49 UTC (rev 145355)
@@ -1,3 +1,15 @@
+2013-03-11 Chris Hopman <cjhop...@chromium.org>
+
+ [chromium] Android apk targets should depend directly on Java library targets
+ https://bugs.webkit.org/show_bug.cgi?id=111746
+
+ Reviewed by Eric Seidel.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ Make DumpRenderTree_apk depend directly on base_java and net_java.
+ * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
+ Make TestWebKitAPI_apk depend directly on base_java.
+
2013-03-11 Jochen Eisinger <joc...@chromium.org>
[chromium] remove obsolete user gesture methods from WebFrame
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (145354 => 145355)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2013-03-11 10:56:27 UTC (rev 145354)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2013-03-11 11:11:49 UTC (rev 145355)
@@ -512,9 +512,9 @@
'target_name': 'DumpRenderTree_apk',
'type': 'none',
'dependencies': [
- '<(chromium_src_dir)/base/base.gyp:base',
+ '<(chromium_src_dir)/base/base.gyp:base_java',
'<(chromium_src_dir)/media/media.gyp:media_java',
- '<(chromium_src_dir)/net/net.gyp:net',
+ '<(chromium_src_dir)/net/net.gyp:net_java',
'DumpRenderTree',
],
'variables': {
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp (145354 => 145355)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2013-03-11 10:56:27 UTC (rev 145354)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2013-03-11 11:11:49 UTC (rev 145355)
@@ -106,7 +106,7 @@
'target_name': 'TestWebKitAPI_apk',
'type': 'none',
'dependencies': [
- '<(chromium_src_dir)/base/base.gyp:base',
+ '<(chromium_src_dir)/base/base.gyp:base_java',
'TestWebKitAPI',
],
'variables': {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
