| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_arm64_rel.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_arm64_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_arm64_rel.json
|
| index 5bb97a9007ee846e3760457dcfffbe0da3949408..dba260183cdc9fe522e0d97a69c7bee560858e1c 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_arm64_rel.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_arm64_rel.json
|
| @@ -241,7 +241,7 @@
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "name": "create adb symlink"
|
| },
|
| {
|
| @@ -252,7 +252,7 @@
|
| "[BUILDER_CACHE]/android_arm64_rel/src/out/logcat",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -268,7 +268,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -286,7 +286,7 @@
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "-v"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -307,7 +307,7 @@
|
| "-t",
|
| "Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -330,7 +330,7 @@
|
| "-v",
|
| "--overwrite-known-devices-files"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -447,7 +447,7 @@
|
| "--blacklist-file",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/out/bad_devices.json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| @@ -461,7 +461,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -479,7 +479,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -497,7 +497,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -515,7 +515,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -533,7 +533,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -551,7 +551,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -569,7 +569,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -587,7 +587,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -605,7 +605,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -623,7 +623,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -641,7 +641,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -659,7 +659,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -677,7 +677,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_arm64_rel/src/build/android:%(PATH)s"
|
| @@ -695,7 +695,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "name": "AppRTCDemoTest"
|
| },
|
| {
|
| @@ -709,7 +709,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "name": "libjingle_peerconnection_android_unittest"
|
| },
|
| {
|
| @@ -722,7 +722,7 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| @@ -734,7 +734,7 @@
|
| "[BUILDER_CACHE]/android_arm64_rel/src/out/Release/full_log",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/out/logcat"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -755,7 +755,7 @@
|
| "[BUILDER_CACHE]/android_arm64_rel/src/out/Release/full_log",
|
| "gs://chromium-android/logcat_dumps/android_arm64_rel/1337"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_arm64_rel/1337@@@"
|
| @@ -769,7 +769,7 @@
|
| "--more-info",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/out/Release/full_log"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_arm64_rel/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -786,7 +786,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_arm64_rel/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -801,7 +801,7 @@
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| "[BUILDER_CACHE]/android_arm64_rel/src/out/Release/test_logs/*.log"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_arm64_rel",
|
| + "cwd": "[BUILDER_CACHE]/android_arm64_rel/src",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|