| Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json
|
| index d957d22d696c882b52a0308111426cf64417b71e..9423148bbcaccdc9c38736165d16643642055bf7 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.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_WebView_CTS_L_MR1__dbg_/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
|
| + "--adb-path",
|
| + "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "--blacklist-file",
|
| + "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/out/bad_devices.json"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/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",
|
| @@ -528,29 +551,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_WebView_CTS_L_MR1__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| - "[\"07a00ca4\"]",
|
| - "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "spawn_device_monitor"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/chrome/VERSION",
|
| "/path/to/tmp/"
|
|
|