Support --build-dir commandline flag for {run,install}_mandoline.py

mandoline/tools/android/run_mandoline.py

 #!/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 atexit
 import logging
 import os
 import shutil
@@ skipping 37 matching lines @@
 def main():
   logging.basicConfig()
 
   parser = argparse.ArgumentParser(usage=USAGE)
 
   debug_group = parser.add_mutually_exclusive_group()
   debug_group.add_argument('--debug', help='Debug build (default)',
                            default=True, action='store_true')
   debug_group.add_argument('--release', help='Release build', default=False,
                            dest='debug', action='store_false')
+  parser.add_argument('--build-dir', help='Build directory')
   parser.add_argument('--target-cpu', help='CPU architecture to run for.',
                       choices=['x64', 'x86', 'arm'], default='arm')
   parser.add_argument('--device', help='Serial number of the target device.')
   parser.add_argument('--gdb', help='Run gdb',
                       default=False, action='store_true')
   runner_args, args = parser.parse_known_args()
 
-  config = Config(target_os=Config.OS_ANDROID,
+  config = Config(build_dir=runner_args.build_dir,
+                  target_os=Config.OS_ANDROID,
                   target_cpu=runner_args.target_cpu,
                   is_debug=runner_args.debug,
                   apk_name='Mandoline.apk')
   shell = AndroidShell(config)
   shell.InitShell(None, runner_args.device)
   p = shell.ShowLogs()
 
   temp_gdb_dir = None
   if runner_args.gdb:
     temp_gdb_dir = tempfile.mkdtemp()
     atexit.register(shutil.rmtree, temp_gdb_dir, True)
     _CreateSOLinks(temp_gdb_dir)
 
   shell.StartActivity('MandolineActivity',
                       args,
                       sys.stdout,
                       p.terminate,
                       temp_gdb_dir)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())