Title: [137611] trunk/Tools
- Revision
- 137611
- Author
- [email protected]
- Date
- 2012-12-13 10:34:53 -0800 (Thu, 13 Dec 2012)
Log Message
build-webkit --chromium-android forces Make even when update-webkit used --ninja
https://bugs.webkit.org/show_bug.cgi?id=104839
Reviewed by Tony Chang.
This was recommended by Peter as part of:
https://bugs.webkit.org/show_bug.cgi?id=104434#c4
Fixing this makes build-webkit --chromium-android work for the common (ninja) case.
* Scripts/webkitdirs.pm:
(buildChromium):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (137610 => 137611)
--- trunk/Tools/ChangeLog 2012-12-13 18:32:53 UTC (rev 137610)
+++ trunk/Tools/ChangeLog 2012-12-13 18:34:53 UTC (rev 137611)
@@ -1,3 +1,17 @@
+2012-12-13 Eric Seidel <[email protected]>
+
+ build-webkit --chromium-android forces Make even when update-webkit used --ninja
+ https://bugs.webkit.org/show_bug.cgi?id=104839
+
+ Reviewed by Tony Chang.
+
+ This was recommended by Peter as part of:
+ https://bugs.webkit.org/show_bug.cgi?id=104434#c4
+ Fixing this makes build-webkit --chromium-android work for the common (ninja) case.
+
+ * Scripts/webkitdirs.pm:
+ (buildChromium):
+
2012-12-13 Julie Parent <[email protected]>
Loader_unittests should reset state between runs.
Modified: trunk/Tools/Scripts/webkitdirs.pm (137610 => 137611)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-12-13 18:32:53 UTC (rev 137610)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-12-13 18:34:53 UTC (rev 137611)
@@ -2543,7 +2543,7 @@
} elsif (isCygwin() || isWindows()) {
# Windows build - builds the root visual studio solution.
$result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
- } elsif (isChromiumNinja() && !isChromiumAndroid()) {
+ } elsif (isChromiumNinja()) {
$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
