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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus5_Perf__1_.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
Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json
index 056f322c2a9d53eb0cfc83e9ba63ec70c472aeb9..5b6abc5c400500b1430c46a8353a00747afba206 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json
@@ -355,6 +355,29 @@
"cmd": [
"python",
"-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+ "--action",
+ "restart",
+ "--pid-file-path",
+ "/tmp/device_monitor.pid",
+ "--",
+ "[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
+ "--adb-path",
+ "[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/third_party/android_tools/sdk/platform-tools/adb",
+ "--blacklist-file",
+ "[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/out/bad_devices.json"
+ ],
+ "cwd": "[BUILDER_CACHE]/Android_Nexus5_Perf__1_",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/build/android:%(PATH)s"
+ },
+ "name": "spawn_device_monitor"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
"--verbose",
"--adb-path",
@@ -534,29 +557,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",
- "[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/third_party/android_tools/sdk/platform-tools/adb",
- "[\"07a00ca4\"]",
- "--blacklist-file",
- "[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/out/bad_devices.json"
- ],
- "cwd": "[BUILDER_CACHE]/Android_Nexus5_Perf__1_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/build/android:%(PATH)s"
- },
- "name": "spawn_device_monitor"
- },
- {
- "cmd": [
- "python",
- "-u",
"[BUILDER_CACHE]/Android_Nexus5_Perf__1_/src/tools/perf/run_benchmark",
"list",
"--browser",

Powered by Google App Engine
This is Rietveld 408576698