Modified: trunk/Source/WTF/ChangeLog (116439 => 116440)
--- trunk/Source/WTF/ChangeLog 2012-05-08 18:33:02 UTC (rev 116439)
+++ trunk/Source/WTF/ChangeLog 2012-05-08 18:45:13 UTC (rev 116440)
@@ -1,5 +1,14 @@
2012-05-08 Adam Barth <[email protected]>
+ [Chromium] OS(ANDROID) ImageDiff requires us to build WTF for both host and target
+ https://bugs.webkit.org/show_bug.cgi?id=85897
+
+ Reviewed by Tony Chang.
+
+ * WTF.gyp/WTF.gyp:
+
+2012-05-08 Adam Barth <[email protected]>
+
[Chromium] Assertions.cpp should work on OS(ANDROID)
https://bugs.webkit.org/show_bug.cgi?id=85867
Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (116439 => 116440)
--- trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-05-08 18:33:02 UTC (rev 116439)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-05-08 18:45:13 UTC (rev 116440)
@@ -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'],
+ }],
],
},
]
