Allow mojo_debug gdb attach to search symbols in multiple directories.

mojo/devtools/common/mojo_debug

 #!/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 argparse
 import codecs
 import logging
 import os.path
 import requests
@@ skipping 125 matching lines @@
   logcat_cmd = [adb_path, 'logcat', '-d']
   try:
     logcat = subprocess.Popen(logcat_cmd, stdout=subprocess.PIPE)
   except OSError:
     print 'failed to call adb, make sure it is in PATH or pass --adb-path'
     return 1
 
   devtools_dir = os.path.dirname(os.path.abspath(__file__))
   stack_command = [os.path.join(devtools_dir, 'android_stack_parser', 'stack')]
   if args.build_dir:
-    stack_command.append('--build-dir=' + os.path.abspath(args.build_dir))
+    stack_command.append('--build-dir=' +
+            os.path.abspath(','.join(args.build_dir)))
   if args.ndk_dir:
     stack_command.append('--ndk-dir=' + os.path.abspath(args.ndk_dir))
   stack_command.append('-')
   stack = subprocess.Popen(stack_command, stdin=logcat.stdout)
 
   logcat.wait()
   stack.wait()
 
   if logcat.returncode:
     print 'adb logcat failed, make sure the device is connected and available'
@@ skipping 58 matching lines @@
       'arm-linux-androideabi-4.9',
       'prebuilt',
       # TODO(etiennej): DEPS mac NDK and use it on macs.
       'linux-x86_64',
       'bin',
       'arm-linux-androideabi-gdb')
   python_gdb_script_path = os.path.join(os.path.dirname(__file__),
                                         'android_gdb', 'session.py')
   debug_session_arguments = {}
   if args.build_dir:
-    debug_session_arguments["build_directory"] = args.build_dir
+    debug_session_arguments["build_directory_list"] = ','.join(args.build_dir)
   else:
     try:
-      debug_session_arguments["build_directory"] = os.path.join(
+      debug_session_arguments["build_directory_list"] = os.path.join(
           _get_dir_above('out'), 'out', 'android_Debug')
-      if not os.path.exists(debug_session_arguments["build_directory"]):
+      if not os.path.exists(debug_session_arguments["build_directory_list"]):
         raise DirectoryNotFoundException()
     except DirectoryNotFoundException:
       logging.fatal("Unable to find the build directory, please specify it "
                     "using --build-dir.")
       return
 
   if args.package_name:
     debug_session_arguments["package_name"] = args.package_name
   else:
     debug_session_arguments["package_name"] = _DEFAULT_PACKAGE_NAME
@@ skipping 42 matching lines @@
            '--adb-path)')
   device_parser.add_argument('--adb-path', type=str,
       help='path to the adb tool from the Android SDK (optional)')
   device_subparser = device_parser.add_subparsers(
       help='the command to run')
 
   device_stack_parser = device_subparser.add_parser('stack',
       help='symbolize the crash stacktraces from the device log')
   device_stack_parser.add_argument('--ndk-dir', type=str,
       help='path to the directory containing the Android NDK')
-  device_stack_parser.add_argument('--build-dir', type=str,
-      help='list paths to the build directories, separated by commas')
+  device_stack_parser.add_argument('--build-dir', type=str, action='append',
+      help='paths to the build directory, may be repeated')
   device_stack_parser.set_defaults(func=_device_stack)
 
 
 def _add_gdb_command(subparsers):
   gdb_parser = subparsers.add_parser(
       'gdb', help='Debug Mojo Shell and its apps using GDB')
   gdb_subparser = gdb_parser.add_subparsers(
       help='Commands to GDB')
 
   gdb_attach_parser = gdb_subparser.add_parser(
       'attach', help='Attach GDB to a running Mojo Shell process')
   gdb_attach_parser.add_argument('--adb-path', type=str,
       help='path to the adb tool from the Android SDK (optional)')
   gdb_attach_parser.add_argument('--ndk-dir', type=str,
       help='path to the directory containing the Android NDK')
-  gdb_attach_parser.add_argument('--build-dir', type=str,
-      help='path to the build directory')
+  gdb_attach_parser.add_argument('--build-dir', type=str, action='append',
+      help='Paths to the build directory, may be repeated')
   gdb_attach_parser.add_argument('--pyelftools-dir', type=str,
       help='Path to a directory containing third party libraries')
   gdb_attach_parser.add_argument('--gsutil-dir', type=str,
       help='Path to a directory containing gsutil')
   gdb_attach_parser.add_argument('--package-name', type=str,
       help='Name of the Mojo Shell android package to debug')
   gdb_attach_parser.set_defaults(func=_gdb_attach)
 
 
 def main():
   parser = argparse.ArgumentParser(description='Command-line interface for '
                                                 'mojo:debugger')
   subparsers = parser.add_subparsers(help='the tool to run')
   _add_device_command(subparsers)
   _add_tracing_command(subparsers)
   _add_wm_command(subparsers)
   _add_gdb_command(subparsers)
 
   args = parser.parse_args()
   return args.func(args)
 
 if __name__ == '__main__':
   sys.exit(main())