Don't require `--origin` when running on Android anymore. If one doesn't use `mojo:` urls there is no need for `--origin`, see issue #356. R=etiennej@chromium.org Review URL: https://codereview.chromium.org/1282863002 . Cr-Mirrored-From: https://github.com/domokit/mojo Cr-Mirrored-Commit: 49366ecba96be573ae4eec53e9f75262258264d5
diff --git a/devtoolslib/android_shell.py b/devtoolslib/android_shell.py index e07ce77..f5a1fa8 100644 --- a/devtoolslib/android_shell.py +++ b/devtoolslib/android_shell.py
@@ -279,9 +279,7 @@ """Starts the mojo shell, passing it the given arguments. Args: - arguments: List of arguments for the shell. It must contain the - "--origin=" arg. shell_arguments.configure_local_origin() can be used - to set up a local directory on the host machine as origin. + arguments: List of arguments for the shell. stdout: Valid argument for subprocess.Popen() or None. """ if not self.stop_shell_registered: @@ -310,8 +308,6 @@ else: _logger.warning("Running without root access, full stdout of the " "shell won't be available.") - # The origin has to be specified whether it's local or external. - assert any("--origin=" in arg for arg in arguments) parameters.extend(arguments) if parameters: