Modified: trunk/Source/WTF/ChangeLog (116447 => 116448)
--- trunk/Source/WTF/ChangeLog 2012-05-08 19:16:55 UTC (rev 116447)
+++ trunk/Source/WTF/ChangeLog 2012-05-08 19:26:38 UTC (rev 116448)
@@ -1,3 +1,14 @@
+2012-05-08 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r116440.
+ http://trac.webkit.org/changeset/116440
+ https://bugs.webkit.org/show_bug.cgi?id=85904
+
+ Broke the Chromium Android bot (Requested by beverloo on
+ #webkit).
+
+ * WTF.gyp/WTF.gyp:
+
2012-05-08 Adam Barth <[email protected]>
[Chromium] OS(ANDROID) ImageDiff requires us to build WTF for both host and target
Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (116447 => 116448)
--- trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-05-08 19:16:55 UTC (rev 116447)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-05-08 19:26:38 UTC (rev 116448)
@@ -93,14 +93,7 @@
],
}],
],
- },
- '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',
@@ -189,11 +182,6 @@
}],
],
}],
- ['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'],
- }],
],
},
]
