Make skydb --gdb work a bit better on Android

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.
 
 from skypy.skyserver import SkyServer
 import argparse
 import json
 import logging
 import os
@@ skipping 108 matching lines @@
             self.pids['sky_server_root'],
             self.pids['build_dir'])
         shell_args += ['--origin=%s' % build_dir_url]
 
         # Desktop-only work-around for mojo crashing under chromoting.
         if not is_android and args.use_osmesa:
             shell_args.append(
                 '--args-for=mojo:native_viewport_service --use-osmesa')
 
         if is_android and args.gdb:
-            shell_args.append('--wait_for_debugger')
+            shell_args.append('--wait-for-debugger')
 
         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 sky_server_for_args(self, args):
         # FIXME: This is a hack.  sky_server should just take a build_dir
@@ skipping 33 matching lines @@
             print "mojo_shell not found in build_dir '%s'" % args.build_dir
             print "Are you sure you sure that's a valid build_dir location?"
             print "See skydb start --help for more info"
             sys.exit(2)
 
         # FIXME: This is probably not the right way to compute is_android
         # from the build directory?
         gn_args = gn_args_from_build_dir(self.paths.build_dir)
         is_android = 'android_sdk_version' in gn_args
 
+        if is_android and args.gdb and not 'is_debug' in gn_args:
+            # FIXME: We don't include gdbserver in the release APK...
+            print "Cannot debug Release builds on Android"
+            sys.exit(2)
+
         sky_server = self.sky_server_for_args(args)
         self.pids['sky_server_pid'] = sky_server.start()
         self.pids['sky_server_port'] = sky_server.port
         self.pids['sky_server_root'] = sky_server.root
 
         self.pids['build_dir'] = self.paths.build_dir
         self.pids['sky_command_port'] = args.command_port
 
         if is_android:
             # We could make installing conditional on an argument.
@@ skipping 65 matching lines @@
             self.pids['remote_gdbserver_port'] = GDB_PORT
 
         if not args.gdb:
             if not self._wait_for_sky_command_port():
                 logging.error('Failed to start sky')
                 self.stop_command(None)
         else:
             # We could just run gdb_attach_command here, but when I do that
             # it auto-suspends in my zsh.  Unclear why.
             # self.gdb_attach_command(args)
-            print "Run skydb gdb_attach to attach."
+            print "Run 'skydb gdb_attach' to attach."
 
     def _kill_if_exists(self, key, name):
         pid = self.pids.pop(key, None)
         if not pid:
             logging.info('No pid for %s, nothing to do.' % name)
             return
         logging.info('Killing %s (%d).' % (name, pid))
         try:
             os.kill(pid, signal.SIGTERM)
         except OSError:
@@ skipping 310 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()