Add '--adb-path' argument to integration script to modify adb version

blimp/tools/client_engine_integration.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Blimp Client + Engine integration test system
 
    Set up Client and Engine
    Set up Forward to connect machine host with client device.
    Start Engine and run blimp on Android Client.
 """
 
 import argparse
 import json
 import logging
 import posixpath
 import os
 import re
 import signal
 import subprocess
 import sys
 
 SRC_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..'))
 
+ADB_PATH = os.path.join(SRC_PATH, 'third_party', 'android_tools',

[jbudorick, 2016/11/15 03:15:13]

nit: remove this, per below.

[shenghuazhang, 2016/11/15 03:59:17]

Done.

+                        'sdk', 'platform-tools', 'adb')
 DEVIL_PATH = os.path.join(SRC_PATH, 'third_party', 'catapult',
                           'devil')
+DEVIL_CHROMIUM_PATH = os.path.join(SRC_PATH, 'build', 'android')
+
+if DEVIL_CHROMIUM_PATH not in sys.path:
+  sys.path.append(DEVIL_CHROMIUM_PATH)
+
+import devil_chromium
 
 if DEVIL_PATH not in sys.path:
   sys.path.append(DEVIL_PATH)
 
 from devil.android import device_blacklist
 from devil.android import device_utils
 from devil.android import forwarder
 from devil.android.sdk import intent
 from devil.android.sdk import version_codes
 from devil.utils import cmd_helper
@@ skipping 228 matching lines @@
     os.remove(json_file_path)
 
 
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('-l',
                       '--output-linux-directory',
                       required=True,
                       help='Path to the root linux build directory.'
                            ' Example: "out-linux/Debug"')
+  parser.add_argument('--adb-path',
+                      default=ADB_PATH,

[jbudorick, 2016/11/15 03:15:13]

nit: you don't need to set this as the default. devil_chromium.Initialize will
use this adb if adb_path is None.

[shenghuazhang, 2016/11/15 03:59:17]

Done.

+                      type=os.path.abspath,
+                      help='Path to the adb binary.')
   subparsers = parser.add_subparsers(dest="subparser_name")
 
   start_parser = subparsers.add_parser('start')
   start_parser.set_defaults(func=_Start)
   AddStartArguments(start_parser)
 
   run_parser = subparsers.add_parser('run')
   run_parser.set_defaults(func=_Run)
   AddStartArguments(run_parser)
 
   load_parser = subparsers.add_parser('load')
   load_parser.set_defaults(func=_Load)
   load_parser.add_argument('-p',
                            '--apk-path',
                            required=True,
                            help='The path to the APK to install. '
                                 'Including the name of the apk containing '
                                 'the application (with the .apk extension).')
   load_parser.add_argument('-u',
                            '--optional-url',
                            help='URL to navigate to.')
 
   stop_parser = subparsers.add_parser('stop')
   stop_parser.set_defaults(func=_Stop)
 
   args = parser.parse_args()
+  devil_chromium.Initialize(adb_path=args.adb_path)
 
   json_file_path = os.path.join(SRC_PATH, args.output_linux_directory,
                                 ARGS_JSON_FILE)
   blacklist_file = ''
   serial = ''
   if args.subparser_name == 'start' or args.subparser_name == 'run':
     blacklist_file = args.blacklist_file
     serial = args.device
   else:
     if not _IsNonEmptyFile(json_file_path):
@@ skipping 10 matching lines @@
                if blacklist_file
                else None)
   device = device_utils.DeviceUtils.HealthyDevices(
       blacklist=blacklist, device_arg=serial)[0]
 
   args.func(args, json_file_path, device)
 
 
 if __name__ == '__main__':
   main()