Title: [124219] trunk/Tools
- Revision
- 124219
- Author
- [email protected]
- Date
- 2012-07-31 10:26:50 -0700 (Tue, 31 Jul 2012)
Log Message
[Chromium] Don't use ninja for building Chromium for Android
https://bugs.webkit.org/show_bug.cgi?id=92764
Reviewed by Adam Barth.
When Ninja projects files are generated (which will be done for Android),
make sure that the Android builder doesn't unintentionally switch to
using Ninja. We should make that switch at a predetermined time.
* Scripts/webkitdirs.pm:
(buildChromium):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (124218 => 124219)
--- trunk/Tools/ChangeLog 2012-07-31 17:21:01 UTC (rev 124218)
+++ trunk/Tools/ChangeLog 2012-07-31 17:26:50 UTC (rev 124219)
@@ -1,3 +1,17 @@
+2012-07-31 Peter Beverloo <[email protected]>
+
+ [Chromium] Don't use ninja for building Chromium for Android
+ https://bugs.webkit.org/show_bug.cgi?id=92764
+
+ Reviewed by Adam Barth.
+
+ When Ninja projects files are generated (which will be done for Android),
+ make sure that the Android builder doesn't unintentionally switch to
+ using Ninja. We should make that switch at a predetermined time.
+
+ * Scripts/webkitdirs.pm:
+ (buildChromium):
+
2012-07-31 Thiago Marcos P. Santos <[email protected]>
Add a mechanism to dump the stack trace in case of a crash
Modified: trunk/Tools/Scripts/webkitdirs.pm (124218 => 124219)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-07-31 17:21:01 UTC (rev 124218)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-07-31 17:26:50 UTC (rev 124219)
@@ -2589,7 +2589,7 @@
} elsif (isCygwin() || isWindows()) {
# Windows build - builds the root visual studio solution.
$result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
- } elsif (isChromiumNinja()) {
+ } elsif (isChromiumNinja() && !isChromiumAndroid()) {
$result = buildChromiumNinja("all", $clean, @options);
} elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake()) {
# Linux build - build using make.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
