Revert "build: roll infra_paths changes"

scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_mipsel___debug_builder.json

Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_mipsel___debug_builder.json
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_mipsel___debug_builder.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_mipsel___debug_builder.json
index 2d2995d64014117c85be66706f5200aab85bf550..51a941d4a4c44a80aa8042a20f04ec7cef4e4c4d 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_mipsel___debug_builder.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_mipsel___debug_builder.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
       "--root",
       "v8",
       "--revision_mapping_file",
       "{\"v8\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,6 +25,7 @@
       "--no_shallow",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -63,9 +64,10 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_DEFINES": "asan=1 clang=1 gomadir='[ROOT]/b/build/goma' sanitizer_coverage=edge target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=mipsel",
+      "GYP_DEFINES": "asan=1 clang=1 gomadir='[BUILD]/goma' sanitizer_coverage=edge target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=mipsel",
       "GYP_GENERATORS": "ninja",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -80,6 +82,7 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
@@ -89,10 +92,11 @@
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
       "--src-dir",
-      "[CWD]/v8",
+      "[SLAVE_BUILD]/v8",
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -119,9 +123,9 @@
       "--target",
       "Debug",
       "--src-dir",
-      "[CWD]/v8",
+      "[SLAVE_BUILD]/v8",
       "--goma-cache-dir",
-      "[ROOT]/b/build/slave/goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--compiler",
@@ -131,11 +135,12 @@
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
-      "[ROOT]/b/build/goma",
+      "[BUILD]/goma",
       "--clobber",
       "--",
       "d8"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -150,9 +155,10 @@
       "python",
       "-u",
       "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n  with open(sys.argv[2], 'w') as f:\n    json.dump(os.listdir(sys.argv[1]), f)\n",
-      "[CWD]/v8/out/Debug",
+      "[SLAVE_BUILD]/v8/out/Debug",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "listdir build_dir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -173,18 +179,19 @@
       "python",
       "-u",
       "RECIPE_MODULE[build::archive]/resources/zip_archive.py",
-      "[TMP]/chrome_staging_tmp_1",
+      "[TMP_BASE]/chrome_staging_tmp_1",
       "d8-mipsel-asan-linux-debug-v8-component-50110",
       "[\"file 1\", \"file 2\"]",
-      "[CWD]/v8/out/Debug"
+      "[SLAVE_BUILD]/v8/out/Debug"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "zipping"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "--",
       "-h",
       "x-goog-meta-Cr-Commit-Position:refs/heads/master@{#50110}",
@@ -195,9 +202,10 @@
       "cp",
       "-a",
       "public-read",
-      "[TMP]/chrome_staging_tmp_1/d8-mipsel-asan-linux-debug-v8-component-50110.zip",
+      "[TMP_BASE]/chrome_staging_tmp_1/d8-mipsel-asan-linux-debug-v8-component-50110.zip",
       "gs://v8-asan/linux-debug/d8-mipsel-asan-linux-debug-v8-component-50110.zip"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/v8-asan/linux-debug/d8-mipsel-asan-linux-debug-v8-component-50110.zip@@@"
@@ -208,8 +216,9 @@
       "python",
       "-u",
       "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
-      "[TMP]/chrome_staging_tmp_1/d8-mipsel-asan-linux-debug-v8-component-50110.zip"
+      "[TMP_BASE]/chrome_staging_tmp_1/d8-mipsel-asan-linux-debug-v8-component-50110.zip"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "d8-mipsel-asan-linux-debug-v8-component-50110.zip",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",