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

Unified Diff: infra/recipes/android/perf.py

Issue 2438563004: [Android] Always use devil's adb in the perf recipes. (RELAND) (Closed)
Patch Set: revised: prefetch adb 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 | infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/recipes/android/perf.py
diff --git a/infra/recipes/android/perf.py b/infra/recipes/android/perf.py
index b1d4b8e4db737897ea5b7d78a1470b32c84b315a..f8940d0ebae92edf2a67d4dfc66eb1f0ca1c8796 100644
--- a/infra/recipes/android/perf.py
+++ b/infra/recipes/android/perf.py
@@ -156,6 +156,22 @@ def RunSteps(api):
api.path['checkout'] = api.path['slave_build'].join('src')
api.chromium_android.clean_local_files()
+ # TODO(jbudorick): Remove this after resolving
+ # https://github.com/catapult-project/catapult/issues/2901
+ devil_path = api.path['checkout'].join('third_party', 'catapult', 'devil')
+ api.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])
+ api.adb.set_adb_path(
+ devil_path.join('bin', 'deps', 'linux2', 'x86_64', 'bin', 'adb'))
+
api.chromium_android.download_build(bucket=builder['bucket'],
path=builder['path'](api))
« no previous file with comments | « no previous file | infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698