Fix apptest builds and runner on Android.

mojo/tools/mopy/android.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import atexit
 import datetime
 import email.utils
 import hashlib
 import itertools
 import json
@@ skipping 313 matching lines @@
     Returns arguments that should be appended to shell argument list."""
     if 'cannot run as root' in subprocess.check_output(
         self._CreateADBCommand(['root'])):
       raise Exception("Unable to run adb as root.")
     subprocess.check_call(
         self._CreateADBCommand(['install', '-r', self.shell_apk_path, '-i',
                                 self.target_package]))
     atexit.register(self.StopShell)
 
     extra_shell_args = []
-    if origin:

[sky, 2015/05/12 19:39:53]

I added this code because mandoline doesn't specify an origin.

[msw, 2015/05/12 20:53:07]

OK, now it respects origin=None and starts a server for origin == 'localhost'

-      origin_url = origin if origin else self._StartHttpServerForDirectory(
-          self.local_dir, DEFAULT_BASE_PORT if fixed_port else 0)
-      extra_shell_args.append("--origin=" + origin_url)
+    origin_url = origin if origin else self._StartHttpServerForDirectory(
+        self.local_dir, DEFAULT_BASE_PORT if fixed_port else 0)
+    extra_shell_args.append("--origin=" + origin_url)
 
     return extra_shell_args
 
   def StartShell(self,
                  arguments,
                  stdout=None,
                  on_application_stop=None,
                  fixed_port=True):
     """
     Starts the mojo shell, passing it the given arguments.
@@ skipping 53 matching lines @@
 
     Returns the process responsible for reading the logs.
     """
     logcat = subprocess.Popen(self._CreateADBCommand([
                                'logcat',
                                '-s',
                                ' '.join(LOGCAT_TAGS)]),
                               stdout=sys.stdout)
     atexit.register(_ExitIfNeeded, logcat)
     return logcat