scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json - Issue 2486923002: Use devil's adb with each bisect iteration, also start/stop daemons.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json

Issue 2486923002: Use devil's adb with each bisect iteration, also start/stop daemons. (Closed)

Patch Set: Cleanup. 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 side-by-side diff with in-line comments

Download patch

« scripts/slave/recipe_modules/chromium_android/api.py ('K') | « scripts/slave/recipe_modules/chromium_android/api.py ('k') | scripts/slave/recipes/bisection/android_bisect.expected/basic_android_fyi_perf_bisect.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json

diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json b/scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json

index 29f56fd241f85124750474db9ff1a30e9b54d694..a0ed9039b01b102067a2004378be8456ffd9cdfb 100644

--- a/scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json

+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json

@@ -815,7 +815,7 @@

"cmd": [

"python",

"-u",

- "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\n",

+ "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\nfrom devil.android.sdk import adb_wrapper\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\nadb_wrapper.AdbWrapper.StartServer()\n",

ghost stip (do not use) 2016/11/09 01:55:56 because prod and staging recipes import the same d

"[SLAVE_BUILD]/src/third_party/catapult/devil"

"name": "initialize devil",

@@ -824,8 +824,10 @@

"@@@STEP_LOG_LINE@python.inline@import sys@@@",

"@@@STEP_LOG_LINE@python.inline@sys.path.append(sys.argv[1])@@@",

"@@@STEP_LOG_LINE@python.inline@from devil import devil_env@@@",

+ "@@@STEP_LOG_LINE@python.inline@from devil.android.sdk import adb_wrapper@@@",

"@@@STEP_LOG_LINE@python.inline@devil_env.config.Initialize()@@@",

"@@@STEP_LOG_LINE@python.inline@devil_env.config.PrefetchPaths(dependencies=['adb'])@@@",

+ "@@@STEP_LOG_LINE@python.inline@adb_wrapper.AdbWrapper.StartServer()@@@",

"@@@STEP_LOG_END@python.inline@@@"

]