Diff
Modified: trunk/Source/WTF/ChangeLog (116972 => 116973)
--- trunk/Source/WTF/ChangeLog 2012-05-14 18:18:50 UTC (rev 116972)
+++ trunk/Source/WTF/ChangeLog 2012-05-14 18:26:41 UTC (rev 116973)
@@ -1,3 +1,12 @@
+2012-05-14 Wei James <[email protected]>
+
+ [Chromium] ImageDiff should be build for host on Android
+ https://bugs.webkit.org/show_bug.cgi?id=82039
+
+ Reviewed by Adam Barth.
+
+ * WTF.gyp/WTF.gyp:
+
2012-05-14 Yong Li <[email protected]>
DFG JIT is not ARM EABI compatible
Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (116972 => 116973)
--- trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-05-14 18:18:50 UTC (rev 116972)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-05-14 18:26:41 UTC (rev 116973)
@@ -93,7 +93,14 @@
],
}],
],
- }
+ },
+ 'conditions': [
+ ['OS=="android" and android_build_type==0', {
+ # Android builds ImageDiff for host, which has a dependency on wtf.
+ # That means we need to build this target for both host and target.
+ 'toolsets': ['host', 'target'],
+ }],
+ ]
},
{
'target_name': 'wtf',
@@ -182,6 +189,11 @@
}],
],
}],
+ ['OS=="android" and android_build_type==0', {
+ # Android builds ImageDiff for host, which has a dependency on wtf.
+ # That means we need to build this target for both host and target.
+ 'toolsets': ['host', 'target'],
+ }],
],
},
]
Modified: trunk/Tools/ChangeLog (116972 => 116973)
--- trunk/Tools/ChangeLog 2012-05-14 18:18:50 UTC (rev 116972)
+++ trunk/Tools/ChangeLog 2012-05-14 18:26:41 UTC (rev 116973)
@@ -1,3 +1,12 @@
+2012-05-14 Wei James <[email protected]>
+
+ [Chromium] ImageDiff should be build for host on Android
+ https://bugs.webkit.org/show_bug.cgi?id=82039
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
2012-05-14 Joone Hur <[email protected]>
Unreviewed. Updating email for committers.py script.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (116972 => 116973)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-05-14 18:18:50 UTC (rev 116972)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-05-14 18:26:41 UTC (rev 116973)
@@ -67,9 +67,9 @@
],
'conditions': [
['OS=="android"', {
- # FIXME: Re-enable building ImageDiff after the dependencies
- # for host have been fixed, as this broke per the WTF move.
- 'type': 'none',
+ # The Chromium Android port will compare images on host rather
+ # than target (a device or emulator) for performance reasons.
+ 'toolsets': ['host'],
}],
],
},
@@ -232,9 +232,7 @@
}],
['OS=="android"', {
'dependencies': [
- # FIXME: Re-enable building ImageDiff on Android.
- # https://bugs.webkit.org/show_bug.cgi?id=82039
- #'ImageDiff#host',
+ 'ImageDiff#host',
],
'sources/': [
['include', 'chromium/TestShellLinux\\.cpp$'],
