Title: [111377] trunk/Source/WTF
- Revision
- 111377
- Author
- [email protected]
- Date
- 2012-03-20 03:21:26 -0700 (Tue, 20 Mar 2012)
Log Message
[Chromium] Fix the Android build by building NEWWTF for host
https://bugs.webkit.org/show_bug.cgi?id=81643
Reviewed by Tony Gentilcore.
Chromium for Android builds the ImageDiff target for the host architecture,
so all dependencies it has need to be able to build for host as well.
r111258 added (new)WTF as a dependency instead of just including the
header files, so make it possible to build the newwtf target for host.
* WTF.gyp/WTF.gyp:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (111376 => 111377)
--- trunk/Source/WTF/ChangeLog 2012-03-20 10:08:26 UTC (rev 111376)
+++ trunk/Source/WTF/ChangeLog 2012-03-20 10:21:26 UTC (rev 111377)
@@ -1,3 +1,17 @@
+2012-03-20 Peter Beverloo <[email protected]>
+
+ [Chromium] Fix the Android build by building NEWWTF for host
+ https://bugs.webkit.org/show_bug.cgi?id=81643
+
+ Reviewed by Tony Gentilcore.
+
+ Chromium for Android builds the ImageDiff target for the host architecture,
+ so all dependencies it has need to be able to build for host as well.
+ r111258 added (new)WTF as a dependency instead of just including the
+ header files, so make it possible to build the newwtf target for host.
+
+ * WTF.gyp/WTF.gyp:
+
2012-03-19 Dan Bernstein <[email protected]>
Set the svn:ignore property on the Xcode project.
Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (111376 => 111377)
--- trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-03-20 10:08:26 UTC (rev 111376)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-03-20 10:21:26 UTC (rev 111377)
@@ -46,5 +46,12 @@
'../',
],
},
+ 'conditions': [
+ ['OS=="android"', {
+ # Android builds ImageDiff for host, which has a dependency on newwtf
+ # so needs to be able to build this target for host as well.
+ 'toolsets': ['host', 'target'],
+ }],
+ ],
}]
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
