Move runner stuff into a runner namespace.

mojo/tools/mopy/paths.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 os
 
 from .config import Config
 from .gn import BuildDirectoryForConfig
 
 class Paths(object):
@@ skipping 18 matching lines @@
     if self.build_dir is not None:
       self.mojo_shell_path = os.path.join(self.build_dir, "mojo_runner")
       # TODO(vtl): Use the host OS here, since |config| may not be available.
       # In any case, if the target is Windows, but the host isn't, using
       # |os.path| isn't correct....
       if Config.GetHostOS() == Config.OS_WINDOWS:
         self.mojo_shell_path += ".exe"
       if config and config.target_os == Config.OS_ANDROID:
         self.target_mojo_shell_path = os.path.join(self.build_dir,
                                                    "apks",
-                                                   "MojoShell.apk")
+                                                   "MojoRunner.apk")
       else:
         self.target_mojo_shell_path = self.mojo_shell_path
     else:
       self.mojo_shell_path = None
       self.target_mojo_shell_path = None
 
   def RelPath(self, path):
     """Returns the given path, relative to the current directory."""
     return os.path.relpath(path)
 
@@ skipping 10 matching lines @@
       return os.path.join(self.build_dir, name + '.mojo')
     return name + '.mojo'
 
   @staticmethod
   def IsValidAppUrl(url):
     """Returns False if url is malformed, True otherwise."""
     try:
       return len(url.split(':')) == 2
     except ValueError:
       return False