| Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus9_Perf__2_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus9_Perf__2_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus9_Perf__2_.json
|
| index 8879c4fb0bbc7bb7bac00d4188ceca22f03c88da..af9f2b054c8c87794634c9210b71b09899afa6ac 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus9_Perf__2_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus9_Perf__2_.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_Nexus9_Perf__2_/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
|
| + "--adb-path",
|
| + "[BUILDER_CACHE]/Android_Nexus9_Perf__2_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "--blacklist-file",
|
| + "[BUILDER_CACHE]/Android_Nexus9_Perf__2_/src/out/bad_devices.json"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]/Android_Nexus9_Perf__2_",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[BUILDER_CACHE]/Android_Nexus9_Perf__2_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Nexus9_Perf__2_/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_Nexus9_Perf__2_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| - "[\"07a00ca4\"]",
|
| - "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Nexus9_Perf__2_/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Nexus9_Perf__2_",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Nexus9_Perf__2_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Nexus9_Perf__2_/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "spawn_device_monitor"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "[BUILDER_CACHE]/Android_Nexus9_Perf__2_/src/tools/perf/run_benchmark",
|
| "list",
|
| "--browser",
|
|
|