| Index: build/android/adb_install_apk.py
|
| diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
|
| index bc55bf88b456dfe35123647c6739395e470fe3b8..7904b41a53181da51a73376ea7fdd8e568e8b6c4 100755
|
| --- a/build/android/adb_install_apk.py
|
| +++ b/build/android/adb_install_apk.py
|
| @@ -13,7 +13,6 @@ import os
|
| import sys
|
|
|
| import devil_chromium
|
| -from devil import devil_env
|
| from devil.android import apk_helper
|
| from devil.android import device_blacklist
|
| from devil.android import device_errors
|
| @@ -57,7 +56,7 @@ def main():
|
| default=[],
|
| help='Target device for apk to install on. Enter multiple'
|
| ' times for multiple devices.')
|
| - parser.add_argument('--adb-path',
|
| + parser.add_argument('--adb-path', type=os.path.abspath,
|
| help='Absolute path to the adb binary to use.')
|
| parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
|
| parser.add_argument('-v', '--verbose', action='count',
|
| @@ -74,17 +73,9 @@ def main():
|
| run_tests_helper.SetLogLevel(args.verbose)
|
| constants.SetBuildType(args.build_type)
|
|
|
| - devil_custom_deps = None
|
| - if args.adb_path:
|
| - devil_custom_deps = {
|
| - 'adb': {
|
| - devil_env.GetPlatform(): [args.adb_path],
|
| - },
|
| - }
|
| -
|
| devil_chromium.Initialize(
|
| output_directory=constants.GetOutDirectory(),
|
| - custom_deps=devil_custom_deps)
|
| + adb_path=args.adb_path)
|
|
|
| apk = args.apk_path or args.apk_name
|
| if not apk.endswith('.apk'):
|
|
|