Auto merge of #9150 - mbrubeck:run-android, r=larsbergstrom

Make "mach run" use --android by default when enabled in .servobuild

When `.servobuild` has `android = true`, the `mach run` command should default to running on Android.

r? @larsbergstrom

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9150)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-05 01:22:53 +05:30
commit ea4206e362

View file

@ -41,7 +41,7 @@ class PostBuildCommands(CommandBase):
help='Run the release build')
@CommandArgument('--dev', '-d', action='store_true',
help='Run the dev build')
@CommandArgument('--android', action='store_true',
@CommandArgument('--android', action='store_true', default=None,
help='Run on an Android device through `adb shell`')
@CommandArgument('--debug', action='store_true',
help='Enable the debugger. Not specifying a '
@ -53,10 +53,13 @@ class PostBuildCommands(CommandBase):
@CommandArgument(
'params', nargs='...',
help="Command-line arguments to be passed through to Servo")
def run(self, params, release=False, dev=False, android=False, debug=False, debugger=None):
def run(self, params, release=False, dev=False, android=None, debug=False, debugger=None):
env = self.build_env()
env["RUST_BACKTRACE"] = "1"
if android is None:
android = self.config["build"]["android"]
if android:
if debug:
print("Android on-device debugging is not supported by mach yet. See")