diff options
Diffstat (limited to 'catapult/devil/devil/android/tools/wait_for_devices.py')
| -rwxr-xr-x | catapult/devil/devil/android/tools/wait_for_devices.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/catapult/devil/devil/android/tools/wait_for_devices.py b/catapult/devil/devil/android/tools/wait_for_devices.py index 4bde2cd4..bc733355 100755 --- a/catapult/devil/devil/android/tools/wait_for_devices.py +++ b/catapult/devil/devil/android/tools/wait_for_devices.py @@ -14,8 +14,8 @@ if __name__ == '__main__': os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..'))) -from devil import devil_env from devil.android import device_utils +from devil.android.tools import script_common from devil.utils import run_tests_helper @@ -31,13 +31,7 @@ def main(raw_args): args = parser.parse_args(raw_args) run_tests_helper.SetLogLevel(args.verbose) - - devil_dynamic_config = devil_env.EmptyConfig() - if args.adb_path: - devil_dynamic_config['dependencies'].update( - devil_env.LocalConfigItem( - 'adb', devil_env.GetPlatform(), args.adb_path)) - devil_env.config.Initialize(configs=[devil_dynamic_config]) + script_common.InitializeEnvironment(args) devices = device_utils.DeviceUtils.HealthyDevices( device_arg=args.device_serials) |