| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
| 6 | 6 |
| 7 | 7 |
| 8 DEPS = [ | 8 DEPS = [ |
| 9 'build/adb', | 9 'build/adb', |
| 10 'build/chromium', | 10 'build/chromium', |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 api.chromium_tests.get_compile_targets_for_scripts().json.output | 149 api.chromium_tests.get_compile_targets_for_scripts().json.output |
| 150 | 150 |
| 151 builder['tests'] = api.chromium_tests.generate_tests_from_test_spec( | 151 builder['tests'] = api.chromium_tests.generate_tests_from_test_spec( |
| 152 api, test_spec, builder, buildername, mastername, False, None, | 152 api, test_spec, builder, buildername, mastername, False, None, |
| 153 scripts_compile_targets, [api.chromium_tests.steps.generate_script], | 153 scripts_compile_targets, [api.chromium_tests.steps.generate_script], |
| 154 bot_update_step) | 154 bot_update_step) |
| 155 | 155 |
| 156 api.path['checkout'] = api.path['slave_build'].join('src') | 156 api.path['checkout'] = api.path['slave_build'].join('src') |
| 157 api.chromium_android.clean_local_files() | 157 api.chromium_android.clean_local_files() |
| 158 | 158 |
| 159 # TODO(jbudorick): Remove this after resolving |
| 160 # https://github.com/catapult-project/catapult/issues/2901 |
| 161 devil_path = api.path['checkout'].join('third_party', 'catapult', 'devil') |
| 162 api.python.inline( |
| 163 'initialize devil', |
| 164 """ |
| 165 import sys |
| 166 sys.path.append(sys.argv[1]) |
| 167 from devil import devil_env |
| 168 devil_env.config.Initialize() |
| 169 devil_env.config.PrefetchPaths(dependencies=['adb']) |
| 170 """, |
| 171 args=[devil_path]) |
| 172 api.adb.set_adb_path( |
| 173 devil_path.join('bin', 'deps', 'linux2', 'x86_64', 'bin', 'adb')) |
| 174 |
| 159 api.chromium_android.download_build(bucket=builder['bucket'], | 175 api.chromium_android.download_build(bucket=builder['bucket'], |
| 160 path=builder['path'](api)) | 176 path=builder['path'](api)) |
| 161 | 177 |
| 162 api.chromium_android.common_tests_setup_steps( | 178 api.chromium_android.common_tests_setup_steps( |
| 163 perf_setup=True, | 179 perf_setup=True, |
| 164 remove_system_webview=builder.get('remove_system_webview', False)) | 180 remove_system_webview=builder.get('remove_system_webview', False)) |
| 165 | 181 |
| 166 required_apks = builder.get('required_apks', []) | 182 required_apks = builder.get('required_apks', []) |
| 167 for apk in required_apks: | 183 for apk in required_apks: |
| 168 api.chromium_android.adb_install_apk(apk) | 184 api.chromium_android.adb_install_apk(apk) |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 "adb_status": "device", | 367 "adb_status": "device", |
| 352 "imei_slice": "", | 368 "imei_slice": "", |
| 353 "ro.build.product": "bullhead", | 369 "ro.build.product": "bullhead", |
| 354 "ro.build.id": "MDB08Q", | 370 "ro.build.id": "MDB08Q", |
| 355 "serial": "00d0d567893340f4", | 371 "serial": "00d0d567893340f4", |
| 356 "wifi_ip": "" | 372 "wifi_ip": "" |
| 357 }] | 373 }] |
| 358 }}), | 374 }}), |
| 359 retcode=87)) | 375 retcode=87)) |
| 360 | 376 |
| OLD | NEW |