Teach 'stop' command how to kill the running Android process

sky/tools/skydb

 #!/usr/bin/env python
 # 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 skypy.paths
 from skypy.skyserver import SkyServer
 import argparse
 import json
 import logging
@@ skipping 18 matching lines @@
     'text/sky',
     'text/plain',
 ]
 
 DEFAULT_SKY_COMMAND_PORT = 7777
 GDB_PORT = 8888
 SKY_SERVER_PORT = 9999
 PID_FILE_PATH = "/tmp/skydb.pids"
 DEFAULT_URL = "https://raw.githubusercontent.com/domokit/mojo/master/sky/examples/home.sky"
 
+ANDROID_PACKAGE = "org.chromium.mojo.shell"
+ANDROID_ACTIVITY = "%s/.MojoShellActivity" % ANDROID_PACKAGE
 
 # FIXME: Move this into mopy.config
 def gn_args_from_build_dir(build_dir):
     gn_cmd = [
         'gn', 'args',
         build_dir,
         '--list', '--short'
     ]
     config = {}
     for line in subprocess.check_output(gn_cmd).strip().split('\n'):
@@ skipping 32 matching lines @@
         # am shell --esa: (someone shoot me now)
         #  [--esa <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]
         #  (to embed a comma into a string escape it using "\,")
         escaped_args = map(lambda arg: arg.replace(',', '\\,'), shell_args)
         return [
             'adb', 'shell',
             'am', 'start',
             '-W',
             '-S',
             '-a', 'android.intent.action.VIEW',
-            '-n', 'org.chromium.mojo.shell/.MojoShellActivity',
+            '-n', ANDROID_ACTIVITY,
             # FIXME: This quoting is very error-prone.  Perhaps we should read
             # our args from a file instead?
             '--esa', 'parameters', ','.join(escaped_args),
         ]
 
     def _build_mojo_shell_command(self, args):
         content_handlers = ['%s,%s' % (mime_type, 'mojo:sky_viewer')
             for mime_type in SUPPORTED_MIME_TYPES]
 
         remote_command_port = self.pids.get('remote_sky_command_port', self.pids['sky_command_port'])
 
         shell_args = [
             '--v=1',
             '--content-handlers=%s' % ','.join(content_handlers),
             '--url-mappings=mojo:window_manager=mojo:sky_debugger',
             '--args-for=mojo:sky_debugger_prompt %d' % remote_command_port,
             'mojo:window_manager',
         ]
-        # FIXME: This probably is wrong for android?
-        if args.use_osmesa:
-            shell_args.append('--args-for=mojo:native_viewport_service --use-osmesa')
 
         if 'remote_sky_server_port' in self.pids:
             shell_command = self._wrap_for_android(shell_args)
         else:
             shell_command = [self.paths.mojo_shell_path] + shell_args
 
         return shell_command
 
     def _connect_to_device(self):
         device = android_commands.AndroidCommands(
@@ skipping 49 matching lines @@
             self.pids['remote_sky_server_port'] = device_http_port
 
             port_string = 'tcp:%s' % args.command_port
             subprocess.check_call([
                 'adb', 'forward', port_string, port_string
             ])
             self.pids['remote_sky_command_port'] = args.command_port
 
         shell_command = self._build_mojo_shell_command(args)
 
-        # On android we can't launch inside gdb, but rather have to attach.
-        if args.gdb and not is_android:
-            shell_command = ['gdbserver', ':%s' % GDB_PORT] + shell_command
+        if not is_android:
+            # Desktop-only work-around for mojo crashing under chromoting.
+            if args.use_osmesa:
+                shell_args.append(
+                    '--args-for=mojo:native_viewport_service --use-osmesa')
+
+            # On android we can't launch inside gdb, but rather have to attach.
+            if args.gdb:
+                shell_command = ['gdbserver', ':%s' % GDB_PORT] + shell_command
 
         print ' '.join(map(pipes.quote, shell_command))
         self.pids['mojo_shell_pid'] = subprocess.Popen(shell_command).pid
 
         if args.gdb and is_android:
             gdbserver_cmd = ['gdbserver', '--attach', ':%s' % GDB_PORT]
             self.pids['remote_gdbserver_pid'] = subprocess.Popen(shell_command).pid
 
             port_string = 'tcp:%s' % GDB_PORT
             subprocess.check_call([
@@ skipping 31 matching lines @@
         if 'remote_sky_server_port' in self.pids:
             device = android_commands.AndroidCommands(
                 self.pids['device_serial'])
             forwarder.Forwarder.UnmapAllDevicePorts(device)
 
         if 'remote_sky_command_port' in self.pids:
             # adb forward --remove takes the *host* port, not the remote port.
             port_string = 'tcp:%s' % self.pids['sky_command_port']
             subprocess.call(['adb', 'forward', '--remove', port_string])
 
+            subprocess.call([
+                'adb', 'shell', 'am', 'force-stop', ANDROID_PACKAGE])
+
         if 'remote_gdbserver_port' in self.pids:
             port_string = 'tcp:%s' % self.pids['remote_gdbserver_port']
             subprocess.call(['adb', 'forward', '--remove', port_string])
 
     def load_command(self, args):
         if not urlparse.urlparse(args.url_or_path).scheme:
             # The load happens on the remote device, use the remote port.
             remote_sky_server_port = self.pids.get('remote_sky_server_port',
                 self.pids['sky_server_port'])
             url = SkyServer.url_for_path(remote_sky_server_port,
@@ skipping 120 matching lines @@
         load_parser.set_defaults(func=self.load_command)
 
         args = parser.parse_args()
         args.func(args)
 
         self._write_pid_file(PID_FILE_PATH, self.pids)
 
 
 if __name__ == '__main__':
     SkyDebugger().main()