| Index: scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_nexus5X_perf_bisect.json | 
| diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_nexus5X_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_nexus5X_perf_bisect.json | 
| index ce07fdd90f269d0d31bd2150dcf3797447a5947e..edbc08c2de35f1e2210081134ab964642df8d14b 100644 | 
| --- a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_nexus5X_perf_bisect.json | 
| +++ b/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_nexus5X_perf_bisect.json | 
| @@ -11,13 +11,13 @@ | 
| "--slave", | 
| "TestSlavename", | 
| "--spec", | 
| -      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", | 
| +      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", | 
| "--root", | 
| "src", | 
| "--revision_mapping_file", | 
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", | 
| "--git-cache-dir", | 
| -      "[GIT_CACHE]", | 
| +      "[ROOT]/b/build/slave/cache_dir", | 
| "--issue", | 
| "12853011", | 
| "--patchset", | 
| @@ -30,7 +30,6 @@ | 
| "src@HEAD", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -107,12 +106,11 @@ | 
| "python", | 
| "-u", | 
| "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n  os.remove(sys.argv[3])\nexcept OSError:\n  pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n  for f in files:\n    if f.endswith('.pyc'):\n      os.remove(os.path.join(base, f))\n", | 
| -      "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", | 
| -      "[SLAVE_BUILD]/src/out/Release/test_logs", | 
| -      "[SLAVE_BUILD]/src/out/build_product.zip", | 
| -      "[SLAVE_BUILD]/src" | 
| +      "[CWD]/src/out/Release/debug_info_dumps", | 
| +      "[CWD]/src/out/Release/test_logs", | 
| +      "[CWD]/src/out/build_product.zip", | 
| +      "[CWD]/src" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "clean local files", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@python.inline@@@@", | 
| @@ -137,7 +135,7 @@ | 
| "--cached", | 
| "--name-only" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/src", | 
| +    "cwd": "[CWD]/src", | 
| "name": "git diff to analyze patch", | 
| "stdout": "/path/to/tmp/", | 
| "~followup_annotations": [ | 
| @@ -149,25 +147,23 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/build/symlink.py", | 
| +      "[CWD]/src/build/symlink.py", | 
| "-f", | 
| -      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", | 
| +      "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", | 
| "~/adb" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "create adb symlink" | 
| }, | 
| { | 
| "cmd": [ | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", | 
| "--", | 
| -      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", | 
| -      "[SLAVE_BUILD]/src/out/logcat" | 
| +      "[CWD]/src/build/android/adb_logcat_monitor.py", | 
| +      "[CWD]/src/out/logcat" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "spawn_logcat_monitor" | 
| }, | 
| @@ -178,29 +174,27 @@ | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py", | 
| "--verbose", | 
| "--adb-path", | 
| -      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" | 
| +      "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "authorize_adb_devices" | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py", | 
| +      "[CWD]/src/build/android/buildbot/bb_device_status_check.py", | 
| "--json-output", | 
| "/path/to/tmp/json", | 
| "--blacklist-file", | 
| -      "[SLAVE_BUILD]/src/out/bad_devices.json", | 
| +      "[CWD]/src/out/bad_devices.json", | 
| "--known-devices-file", | 
| -      "[BUILD]/site_config/.known_devices" | 
| +      "[ROOT]/b/build/site_config/.known_devices" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "device_status_check", | 
| "~followup_annotations": [ | 
| @@ -302,11 +296,11 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/build/android/provision_devices.py", | 
| +      "[CWD]/src/build/android/provision_devices.py", | 
| "-t", | 
| "Release", | 
| "--blacklist-file", | 
| -      "[SLAVE_BUILD]/src/out/bad_devices.json", | 
| +      "[CWD]/src/out/bad_devices.json", | 
| "--output-device-blacklist", | 
| "/path/to/tmp/json", | 
| "--min-battery-level", | 
| @@ -317,10 +311,9 @@ | 
| "350", | 
| "--remove-system-webview" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "provision_devices" | 
| }, | 
| @@ -335,14 +328,13 @@ | 
| "/tmp/device_monitor.pid", | 
| "--", | 
| "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py", | 
| -      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", | 
| +      "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", | 
| "[\"07a00ca4\"]", | 
| "tryserver.chromium.perf", | 
| "android_nexus5X_perf_bisect", | 
| "--blacklist-file", | 
| -      "[SLAVE_BUILD]/src/out/bad_devices.json" | 
| +      "[CWD]/src/out/bad_devices.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "spawn_device_monitor" | 
| }, | 
| { | 
| @@ -352,13 +344,12 @@ | 
| "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_CHROMIUM_NO_ACTION": "1", | 
| "GYP_CROSSCOMPILE": "1", | 
| -      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| +      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=1", | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| "name": "gclient runhooks" | 
| }, | 
| @@ -368,11 +359,10 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::perf_try]/resources/load_config_to_json.py", | 
| "--source", | 
| -      "[SLAVE_BUILD]/src/tools/run-perf-test.cfg", | 
| +      "[CWD]/src/tools/run-perf-test.cfg", | 
| "--output_json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "load config", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -391,12 +381,11 @@ | 
| "python", | 
| "-u", | 
| "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n  os.remove(sys.argv[3])\nexcept OSError:\n  pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n  for f in files:\n    if f.endswith('.pyc'):\n      os.remove(os.path.join(base, f))\n", | 
| -      "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", | 
| -      "[SLAVE_BUILD]/src/out/Release/test_logs", | 
| -      "[SLAVE_BUILD]/src/out/build_product.zip", | 
| -      "[SLAVE_BUILD]/src" | 
| +      "[CWD]/src/out/Release/debug_info_dumps", | 
| +      "[CWD]/src/out/Release/test_logs", | 
| +      "[CWD]/src/out/build_product.zip", | 
| +      "[CWD]/src" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "clean local files (2)", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@python.inline@@@@", | 
| @@ -419,9 +408,8 @@ | 
| "python", | 
| "-u", | 
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n", | 
| -      "[SLAVE_BUILD]/src/out/Release" | 
| +      "[CWD]/src/out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "rmtree build directory", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@python.inline@@@@", | 
| @@ -438,19 +426,18 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb.py", | 
| +      "[CWD]/src/tools/mb/mb.py", | 
| "gen", | 
| "-m", | 
| "tryserver.chromium.perf", | 
| "-b", | 
| "android_nexus5X_perf_bisect", | 
| "--config-file", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", | 
| +      "[CWD]/src/tools/mb/mb_config.pyl", | 
| "--goma-dir", | 
| -      "[BUILD]/goma", | 
| +      "[ROOT]/b/build/goma", | 
| "//out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "generate_build_files (with patch)" | 
| }, | 
| { | 
| @@ -468,9 +455,9 @@ | 
| "--target", | 
| "Release", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]/src", | 
| +      "[CWD]/src", | 
| "--goma-cache-dir", | 
| -      "[GOMA_CACHE]", | 
| +      "[ROOT]/b/build/slave/goma_cache", | 
| "--build-tool", | 
| "ninja", | 
| "--compiler", | 
| @@ -480,15 +467,14 @@ | 
| "--goma-service-account-json-file", | 
| "/creds/service_accounts/service-account-goma-client.json", | 
| "--goma-dir", | 
| -      "[BUILD]/goma", | 
| +      "[ROOT]/b/build/goma", | 
| "--goma-fail-fast", | 
| "--goma-disable-local-fallback", | 
| "--" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "compile (with patch)", | 
| "~followup_annotations": [ | 
| @@ -498,17 +484,16 @@ | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", | 
| +      "[CWD]/src/build/android/adb_install_apk.py", | 
| "ChromePublic.apk", | 
| "-v", | 
| "--blacklist-file", | 
| -      "[SLAVE_BUILD]/src/out/bad_devices.json", | 
| +      "[CWD]/src/out/bad_devices.json", | 
| "--release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "install ChromePublic.apk" | 
| }, | 
| @@ -531,7 +516,7 @@ | 
| "--slave-name=TestSlavename", | 
| "--build-number=571", | 
| "--run-python-script", | 
| -      "[SLAVE_BUILD]/src/tools/perf/run_benchmark", | 
| +      "[CWD]/src/tools/perf/run_benchmark", | 
| "-v", | 
| "--browser=android-chrome", | 
| "sunspider", | 
| @@ -539,9 +524,8 @@ | 
| "--upload-results", | 
| "--results-label=Patch" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| -      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release" | 
| +      "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release" | 
| }, | 
| "name": "Performance Test (With Patch) 1 of 1", | 
| "stderr": "/path/to/tmp/", | 
| @@ -564,13 +548,13 @@ | 
| "--slave", | 
| "TestSlavename", | 
| "--spec", | 
| -      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", | 
| +      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", | 
| "--root", | 
| "src", | 
| "--revision_mapping_file", | 
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", | 
| "--git-cache-dir", | 
| -      "[GIT_CACHE]", | 
| +      "[ROOT]/b/build/slave/cache_dir", | 
| "--rietveld_server", | 
| "https://codereview.chromium.org", | 
| "--output_json", | 
| @@ -580,7 +564,6 @@ | 
| "--force", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -647,13 +630,12 @@ | 
| "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_CHROMIUM_NO_ACTION": "1", | 
| "GYP_CROSSCOMPILE": "1", | 
| -      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| +      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=1", | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| "name": "gclient runhooks (without patch)" | 
| }, | 
| @@ -662,12 +644,11 @@ | 
| "python", | 
| "-u", | 
| "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n  os.remove(sys.argv[3])\nexcept OSError:\n  pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n  for f in files:\n    if f.endswith('.pyc'):\n      os.remove(os.path.join(base, f))\n", | 
| -      "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", | 
| -      "[SLAVE_BUILD]/src/out/Release/test_logs", | 
| -      "[SLAVE_BUILD]/src/out/build_product.zip", | 
| -      "[SLAVE_BUILD]/src" | 
| +      "[CWD]/src/out/Release/debug_info_dumps", | 
| +      "[CWD]/src/out/Release/test_logs", | 
| +      "[CWD]/src/out/build_product.zip", | 
| +      "[CWD]/src" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "clean local files (3)", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@python.inline@@@@", | 
| @@ -689,19 +670,18 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb.py", | 
| +      "[CWD]/src/tools/mb/mb.py", | 
| "gen", | 
| "-m", | 
| "tryserver.chromium.perf", | 
| "-b", | 
| "android_nexus5X_perf_bisect", | 
| "--config-file", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", | 
| +      "[CWD]/src/tools/mb/mb_config.pyl", | 
| "--goma-dir", | 
| -      "[BUILD]/goma", | 
| +      "[ROOT]/b/build/goma", | 
| "//out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "generate_build_files Without Patch" | 
| }, | 
| { | 
| @@ -719,9 +699,9 @@ | 
| "--target", | 
| "Release", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]/src", | 
| +      "[CWD]/src", | 
| "--goma-cache-dir", | 
| -      "[GOMA_CACHE]", | 
| +      "[ROOT]/b/build/slave/goma_cache", | 
| "--build-tool", | 
| "ninja", | 
| "--compiler", | 
| @@ -731,15 +711,14 @@ | 
| "--goma-service-account-json-file", | 
| "/creds/service_accounts/service-account-goma-client.json", | 
| "--goma-dir", | 
| -      "[BUILD]/goma", | 
| +      "[ROOT]/b/build/goma", | 
| "--goma-fail-fast", | 
| "--goma-disable-local-fallback", | 
| "--" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "compile Without Patch", | 
| "~followup_annotations": [ | 
| @@ -749,17 +728,16 @@ | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", | 
| +      "[CWD]/src/build/android/adb_install_apk.py", | 
| "ChromePublic.apk", | 
| "-v", | 
| "--blacklist-file", | 
| -      "[SLAVE_BUILD]/src/out/bad_devices.json", | 
| +      "[CWD]/src/out/bad_devices.json", | 
| "--release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "install ChromePublic.apk (2)" | 
| }, | 
| @@ -782,16 +760,15 @@ | 
| "--slave-name=TestSlavename", | 
| "--build-number=571", | 
| "--run-python-script", | 
| -      "[SLAVE_BUILD]/src/tools/perf/run_benchmark", | 
| +      "[CWD]/src/tools/perf/run_benchmark", | 
| "-v", | 
| "--browser=android-chrome", | 
| "sunspider", | 
| "--upload-results", | 
| "--results-label=TOT" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| -      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release" | 
| +      "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release" | 
| }, | 
| "name": "Performance Test (Without Patch) 1 of 1", | 
| "stderr": "/path/to/tmp/", | 
| @@ -802,7 +779,6 @@ | 
| }, | 
| { | 
| "cmd": [], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "Results" | 
| }, | 
| { | 
| @@ -811,7 +787,6 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::perf_dashboard]/resources/post_json.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "Post bisect results", | 
| "stdin": "{\"data\": {\"bisect_bot\": \"android_nexus5X_perf_bisect\", \"buildbot_log_url\": \"http://c.org/p/cr/builders/android_nexus5X_perf_bisect/builds/571\", \"cloud_link\": \"\", \"command\": \"src/tools/perf/run_benchmark -v --browser=android-chrome sunspider\", \"metric\": \"dummy/dummy\", \"profiler_links\": [], \"status\": \"completed\", \"try_job_id\": null}, \"url\": \"https://chromeperf.appspot.com/post_bisect_results\"}", | 
| "stdout": "/path/to/tmp/json", | 
| @@ -832,19 +807,17 @@ | 
| "--pid-file-path", | 
| "/tmp/device_monitor.pid" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "shutdown_device_monitor" | 
| }, | 
| { | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py", | 
| +      "[CWD]/src/build/android/adb_logcat_printer.py", | 
| "--output-path", | 
| -      "[SLAVE_BUILD]/src/out/Release/full_log", | 
| -      "[SLAVE_BUILD]/src/out/logcat" | 
| +      "[CWD]/src/out/Release/full_log", | 
| +      "[CWD]/src/out/logcat" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "logcat_dump" | 
| }, | 
| { | 
| @@ -853,7 +826,7 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", | 
| "--", | 
| -      "[DEPOT_TOOLS]/gsutil.py", | 
| +      "[ROOT]/b/depot_tools/gsutil.py", | 
| "--force-version", | 
| "4.7", | 
| "-o", | 
| @@ -862,10 +835,9 @@ | 
| "cp", | 
| "-a", | 
| "public-read", | 
| -      "[SLAVE_BUILD]/src/out/Release/full_log", | 
| +      "[CWD]/src/out/Release/full_log", | 
| "gs://chromium-android/logcat_dumps/android_nexus5X_perf_bisect/571" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "gsutil upload", | 
| "~followup_annotations": [ | 
| "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_nexus5X_perf_bisect/571@@@" | 
| @@ -873,32 +845,30 @@ | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack", | 
| +      "[CWD]/src/third_party/android_platform/development/scripts/stack", | 
| "--arch", | 
| "arm", | 
| "--more-info", | 
| -      "[SLAVE_BUILD]/src/out/Release/full_log" | 
| +      "[CWD]/src/out/Release/full_log" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| -      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", | 
| +      "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release", | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "stack_tool_with_logcat_dump" | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/src/build/android/tombstones.py", | 
| +      "[CWD]/src/build/android/tombstones.py", | 
| "-a", | 
| "-s", | 
| "-w" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| -      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", | 
| +      "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release", | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", | 
| -      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" | 
| +      "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" | 
| }, | 
| "name": "stack_tool_for_tombstones" | 
| }, | 
| @@ -907,9 +877,8 @@ | 
| "python", | 
| "-u", | 
| "\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", | 
| -      "[SLAVE_BUILD]/src/out/Release/test_logs/*.log" | 
| +      "[CWD]/src/out/Release/test_logs/*.log" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test_report", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@python.inline@@@@", | 
|  |