Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Side by Side Diff: scripts/slave/recipe_modules/chromium_android/api.py

Issue 2447633003: [android bisect] use devil's version of adb in bisect. (Closed)
Patch Set: Move to api.chromium_android + also handle android_bisect_staging Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | scripts/slave/recipes/bisection/android_bisect.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 import contextlib 5 import contextlib
6 import datetime 6 import datetime
7 import json 7 import json
8 import os 8 import os
9 import pipes 9 import pipes
10 import re 10 import re
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 # (or at least make the difference clear). 295 # (or at least make the difference clear).
296 self.m.archive.zip_and_upload_build( 296 self.m.archive.zip_and_upload_build(
297 'zip_build', 297 'zip_build',
298 target=self.m.chromium.c.BUILD_CONFIG, 298 target=self.m.chromium.c.BUILD_CONFIG,
299 # We send None as the path so that zip_build.py gets it from factory 299 # We send None as the path so that zip_build.py gets it from factory
300 # properties. 300 # properties.
301 build_url=None, 301 build_url=None,
302 src_dir=self.m.path['slave_build'].join('src'), 302 src_dir=self.m.path['slave_build'].join('src'),
303 exclude_files='lib.target,gen,android_webview,jingle_unittests') 303 exclude_files='lib.target,gen,android_webview,jingle_unittests')
304 304
305 def use_devil_adb(self):
306 # TODO(jbudorick): Remove this after resolving
307 # https://github.com/catapult-project/catapult/issues/2901
308 devil_path = self.m.path['checkout'].join('third_party', 'catapult', 'devil' )
309 self.m.python.inline(
310 'initialize devil',
311 """
312 import sys
313 sys.path.append(sys.argv[1])
314 from devil import devil_env
315 devil_env.config.Initialize()
316 devil_env.config.PrefetchPaths(dependencies=['adb'])
317 """,
318 args=[devil_path])
319 self.m.adb.set_adb_path(
320 devil_path.join('bin', 'deps', 'linux2', 'x86_64', 'bin', 'adb'))
321
305 def create_adb_symlink(self): 322 def create_adb_symlink(self):
306 # Creates a sym link to the adb executable in the home dir 323 # Creates a sym link to the adb executable in the home dir
307 self.m.python( 324 self.m.python(
308 'create adb symlink', 325 'create adb symlink',
309 self.m.path['checkout'].join('build', 'symlink.py'), 326 self.m.path['checkout'].join('build', 'symlink.py'),
310 ['-f', self.m.adb.adb_path(), os.path.join('~', 'adb')], 327 ['-f', self.m.adb.adb_path(), os.path.join('~', 'adb')],
311 infra_step=True) 328 infra_step=True)
312 329
313 def spawn_logcat_monitor(self): 330 def spawn_logcat_monitor(self):
314 self.m.step( 331 self.m.step(
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 script = self.c.test_runner 1583 script = self.c.test_runner
1567 if wrapper_script_suite_name: 1584 if wrapper_script_suite_name:
1568 script = self.m.chromium.output_dir.join('bin', 'run_%s' % 1585 script = self.m.chromium.output_dir.join('bin', 'run_%s' %
1569 wrapper_script_suite_name) 1586 wrapper_script_suite_name)
1570 else: 1587 else:
1571 env = kwargs.get('env', {}) 1588 env = kwargs.get('env', {})
1572 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', 1589 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
1573 self.m.chromium.output_dir) 1590 self.m.chromium.output_dir)
1574 kwargs['env'] = env 1591 kwargs['env'] = env
1575 return self.m.python(step_name, script, args, **kwargs) 1592 return self.m.python(step_name, script, args, **kwargs)
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/bisection/android_bisect.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698