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

Unified 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, 2 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipes/bisection/android_bisect.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9b2008567e1e357194ec3885bcaefd190df0acfa..01a2860333fc800774bac933f37ec95ef690c45f 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -302,6 +302,23 @@ class AndroidApi(recipe_api.RecipeApi):
src_dir=self.m.path['slave_build'].join('src'),
exclude_files='lib.target,gen,android_webview,jingle_unittests')
+ def use_devil_adb(self):
+ # TODO(jbudorick): Remove this after resolving
+ # https://github.com/catapult-project/catapult/issues/2901
+ devil_path = self.m.path['checkout'].join('third_party', 'catapult', 'devil')
+ self.m.python.inline(
+ 'initialize devil',
+ """
+ import sys
+ sys.path.append(sys.argv[1])
+ from devil import devil_env
+ devil_env.config.Initialize()
+ devil_env.config.PrefetchPaths(dependencies=['adb'])
+ """,
+ args=[devil_path])
+ self.m.adb.set_adb_path(
+ devil_path.join('bin', 'deps', 'linux2', 'x86_64', 'bin', 'adb'))
+
def create_adb_symlink(self):
# Creates a sym link to the adb executable in the home dir
self.m.python(
« 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