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

blimp/tools/client_engine_integration.py

Index: blimp/tools/client_engine_integration.py
diff --git a/blimp/tools/client_engine_integration.py b/blimp/tools/client_engine_integration.py
index e28c641d49753f3ff9c29184f59077b426256470..6812108dad573b9bf986964a57935f67d5709265 100755
--- a/blimp/tools/client_engine_integration.py
+++ b/blimp/tools/client_engine_integration.py
@@ -23,8 +23,16 @@ 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)
@@ -273,6 +281,10 @@ def main():
                       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')
@@ -299,6 +311,7 @@ def main():
   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)