Title: [111846] trunk/Tools
- Revision
- 111846
- Author
- [email protected]
- Date
- 2012-03-23 03:19:30 -0700 (Fri, 23 Mar 2012)
Log Message
Unreviewed buildfix for the Chromium Android builder.
Disable the ImageDiff target for now. Android needs to build this for
host rather than for target (as other configurations do), but since the
WTF move the dependency chain got significantly more complicated.
I'll work out a proper fix in the following bug, but since several
things are broken due to this, this buildfix should be landed first.
https://bugs.webkit.org/show_bug.cgi?id=82039
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111845 => 111846)
--- trunk/Tools/ChangeLog 2012-03-23 09:52:28 UTC (rev 111845)
+++ trunk/Tools/ChangeLog 2012-03-23 10:19:30 UTC (rev 111846)
@@ -1,3 +1,17 @@
+2012-03-23 Peter Beverloo <[email protected]>
+
+ Unreviewed buildfix for the Chromium Android builder.
+
+ Disable the ImageDiff target for now. Android needs to build this for
+ host rather than for target (as other configurations do), but since the
+ WTF move the dependency chain got significantly more complicated.
+
+ I'll work out a proper fix in the following bug, but since several
+ things are broken due to this, this buildfix should be landed first.
+ https://bugs.webkit.org/show_bug.cgi?id=82039
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
2012-03-23 Grzegorz Czajkowski <[email protected]>
[EFL][DRT] Implement LayoutTestController's methods related with editing.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (111845 => 111846)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-03-23 09:52:28 UTC (rev 111845)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-03-23 10:19:30 UTC (rev 111846)
@@ -67,7 +67,9 @@
],
'conditions': [
['OS=="android"', {
- 'toolsets': ['host'],
+ # FIXME: Re-enable building ImageDiff after the dependencies
+ # for host have been fixed, as this broke per the WTF move.
+ 'type': 'none',
}],
],
},
@@ -229,7 +231,9 @@
}],
['OS=="android"', {
'dependencies': [
- 'ImageDiff#host',
+ # FIXME: Re-enable building ImageDiff on Android.
+ # https://bugs.webkit.org/show_bug.cgi?id=82039
+ #'ImageDiff#host',
],
'sources/': [
['include', 'chromium/TestShellLinux\\.cpp$'],
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
