Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (93941 => 93942)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-08-27 19:02:55 UTC (rev 93941)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-08-27 19:05:14 UTC (rev 93942)
@@ -74,7 +74,12 @@
descriptionDone = ["updated chromium dependencies"]
command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"]
haltOnFailure = True
+ def start(self):
+ if self.getProperty('fullPlatform') == "chromium-android":
+ self.setCommand(self.command + ['--chromium-android'])
+ return shell.ShellCommand.start(self)
+
class CleanupChromiumCrashLogs(shell.ShellCommand):
name = "cleanup crash logs"
description = ["removing crash logs"]
@@ -83,8 +88,10 @@
haltOnFailure = False
-def appendCustomBuildFlags(step, platform):
- if platform in ('chromium', 'efl', 'gtk', 'qt', 'wincairo', 'wince', 'wx'):
+def appendCustomBuildFlags(step, platform, fullPlatform=""):
+ if fullPlatform == "chromium-android":
+ step.setCommand(step.command + ['--chromium-android'])
+ elif platform in ('chromium', 'efl', 'gtk', 'qt', 'wincairo', 'wince', 'wx'):
step.setCommand(step.command + ['--' + platform])
@@ -102,7 +109,7 @@
if platform == 'mac' and buildOnly:
self.setCommand(self.command + ['DEBUG_INFORMATION_FORMAT=dwarf-with-dsym'])
- appendCustomBuildFlags(self, platform)
+ appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
features = self.getProperty('features')
for feature in features:
@@ -236,7 +243,7 @@
def start(self):
platform = self.getProperty('platform')
- appendCustomBuildFlags(self, platform)
+ appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
if platform == "win":
rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
else:
Modified: trunk/Tools/ChangeLog (93941 => 93942)
--- trunk/Tools/ChangeLog 2011-08-27 19:02:55 UTC (rev 93941)
+++ trunk/Tools/ChangeLog 2011-08-27 19:05:14 UTC (rev 93942)
@@ -1,5 +1,20 @@
2011-08-27 Peter Beverloo <[email protected]>
+ Update the master build bot configuration script to properly
+ deal with the --chromium-android switch.
+ https://bugs.webkit.org/show_bug.cgi?id=66687
+
+ The --chromium-android switch is needed when running
+ update-webkit-chromium and build-webkit, as it'll tell the
+ scripts to pull in the right dependencies and cross-compile
+ WebKit using the Android NDK.
+
+ Reviewed by Adam Barth.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
+2011-08-27 Peter Beverloo <[email protected]>
+
Teach the update and build scripts how to handle dependencies
and cross-compiling rules for the Chromium port on OS(ANDROID).
https://bugs.webkit.org/show_bug.cgi?id=66687
