Chromium Code Reviews| Index: scripts/slave/recipe_modules/chromium_android/api.py |
| diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py |
| index 06a808b5ab7ef15ad3bbfb4bc5865153a22d6249..ea941374048b636b62125e3e28d843c488b16d75 100644 |
| --- a/scripts/slave/recipe_modules/chromium_android/api.py |
| +++ b/scripts/slave/recipe_modules/chromium_android/api.py |
| @@ -293,10 +293,21 @@ class AndroidApi(recipe_api.RecipeApi): |
| env=self.m.chromium.get_env(), |
| infra_step=True) |
| + |
| + def authorize_adb_devices(self): |
| + cmd = [self.m.path['build'].join('scripts', 'slave', 'android', |
| + 'authorize_adb_devices'), |
|
Vadim Sh.
2015/03/06 01:14:32
authorize_adb_devices.py (with '.py'), unless I do
navabi
2015/03/06 01:45:14
Done.
|
| + '--adb', self.m.path['checkout'].join('third_party', 'android_tools', |
|
Vadim Sh.
2015/03/06 01:14:32
--adb-path
navabi
2015/03/06 01:45:13
Done.
|
| + 'sdk', 'platform-tools', 'adb')] |
| + return self.m.step('authorize_adb_devices', cmd, infra_step=True, |
| + env=self.m.chromium.get_env()) |
| + |
| + |
| def detect_and_setup_devices(self, restart_usb=False, skip_wipe=False, |
| disable_location=False, min_battery_level=None, |
| disable_network=False, disable_java_debug=False, |
| reboot_timeout=None): |
| + self.authorize_adb_devices() |
| self.device_status_check(restart_usb=restart_usb) |
| self.provision_devices( |
| skip_wipe=skip_wipe, disable_location=disable_location, |
| @@ -622,6 +633,7 @@ class AndroidApi(recipe_api.RecipeApi): |
| def common_tests_setup_steps(self, perf_setup=False): |
| self.spawn_logcat_monitor() |
| + self.authorize_adb_devices() |
| self.device_status_check() |
| if perf_setup: |
| kwargs = { |
| @@ -757,4 +769,4 @@ class AndroidApi(recipe_api.RecipeApi): |
| elif (step_result.retcode == EXIT_CODES['infra']): |
| step_result.presentation.status = self.m.step.EXCEPTION |
| elif (step_result.retcode == EXIT_CODES['warning']): |
| - step_result.presentation.status = self.m.step.WARNING |
| + step_result.presentation.status = self.m.step.WARNING |