scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json - Issue 2402303003: Enable new device monitor everywhere and launch it earlier in the build.

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/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json

Issue 2402303003: Enable new device monitor everywhere and launch it earlier in the build. (Closed)

Patch Set: With expectations 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 | « scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_builder.json ('k') | scripts/slave/recipes/cronet.expected/android_cronet_tester.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json

diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json b/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json

index b886f8b863e5bc2579ac72e90f8db2b5f91e3a49..7db5f3be8acc8f0ed9f90292778d4e0223b422b5 100644

--- a/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json

+++ b/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json

@@ -530,6 +530,24 @@

"cmd": [

"python",

"-u",

+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",

+ "--action",

+ "restart",

+ "--pid-file-path",

+ "/tmp/device_monitor.pid",

+ "--",

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",

+ "--adb-path",

+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "--blacklist-file",

+ "[SLAVE_BUILD]/src/out/bad_devices.json"

+ ],

+ "name": "spawn_device_monitor"

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",

"--verbose",

"--adb-path",

@@ -698,24 +716,6 @@

"cmd": [

"python",

"-u",

- "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",

- "--action",

- "restart",

- "--pid-file-path",

- "/tmp/device_monitor.pid",

- "--",

- "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

- "[\"07a00ca4\"]",

- "--blacklist-file",

- "[SLAVE_BUILD]/src/out/bad_devices.json"

- ],

- "name": "spawn_device_monitor"

- },

- {

- "cmd": [

- "python",

- "-u",

"[SLAVE_BUILD]/src/out/Release/bin/run_cronet_unittests",

"--blacklist-file",

"[SLAVE_BUILD]/src/out/bad_devices.json",