| Index: scripts/slave/recipes/flutter/flutter.expected/mac_cannot_find_xcode.json
|
| diff --git a/scripts/slave/recipes/flutter/flutter.expected/mac_cannot_find_xcode.json b/scripts/slave/recipes/flutter/flutter.expected/mac_cannot_find_xcode.json
|
| index b4bfb7120400d11d943db113ac23e2345b7cdb5b..2c15ccf53a3a09fd8f712dbed534819c5228b6af 100644
|
| --- a/scripts/slave/recipes/flutter/flutter.expected/mac_cannot_find_xcode.json
|
| +++ b/scripts/slave/recipes/flutter/flutter.expected/mac_cannot_find_xcode.json
|
| @@ -4,9 +4,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\npath = sys.argv[1]\nif os.path.exists(path):\n for p in (os.path.join(path, x) for x in os.listdir(path)):\n if os.path.isdir(p):\n chromium_utils.RemoveDirectory(p)\n else:\n os.unlink(p)\n",
|
| - "[SLAVE_BUILD]"
|
| + "[CWD]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmcontents everything",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -29,11 +28,10 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
|
| "--path",
|
| - "[SLAVE_BUILD]/flutter",
|
| + "[CWD]/flutter",
|
| "--url",
|
| "https://chromium.googlesource.com/external/github.com/flutter/flutter"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "git setup"
|
| },
|
| {
|
| @@ -45,7 +43,7 @@
|
| "master",
|
| "--recurse-submodules"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/flutter",
|
| + "cwd": "[CWD]/flutter",
|
| "name": "git fetch"
|
| },
|
| {
|
| @@ -55,7 +53,7 @@
|
| "-f",
|
| "FETCH_HEAD"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/flutter",
|
| + "cwd": "[CWD]/flutter",
|
| "name": "git checkout"
|
| },
|
| {
|
| @@ -64,7 +62,7 @@
|
| "rev-parse",
|
| "HEAD"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/flutter",
|
| + "cwd": "[CWD]/flutter",
|
| "name": "read revision",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -80,7 +78,7 @@
|
| "-d",
|
| "-x"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/flutter",
|
| + "cwd": "[CWD]/flutter",
|
| "name": "git clean"
|
| },
|
| {
|
| @@ -89,7 +87,7 @@
|
| "submodule",
|
| "sync"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/flutter",
|
| + "cwd": "[CWD]/flutter",
|
| "name": "submodule sync"
|
| },
|
| {
|
| @@ -100,29 +98,27 @@
|
| "--init",
|
| "--recursive"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/flutter",
|
| + "cwd": "[CWD]/flutter",
|
| "name": "submodule update"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/flutter/infra/download_android_tools.py"
|
| + "[CWD]/flutter/infra/download_android_tools.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download android tools"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/ios/find_xcode.py",
|
| + "[ROOT]/b/build/scripts/slave/ios/find_xcode.py",
|
| "--json-file",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_HOME": "[SLAVE_BUILD]/flutter/infra/android_tools",
|
| - "PATH": "[SLAVE_BUILD]/flutter/bin:[SLAVE_BUILD]/flutter/bin/cache/dart-sdk/bin:%(PATH)s",
|
| - "PUB_CACHE": "[SLAVE_BUILD]/.pub-cache"
|
| + "ANDROID_HOME": "[CWD]/flutter/infra/android_tools",
|
| + "PATH": "[CWD]/flutter/bin:[CWD]/flutter/bin/cache/dart-sdk/bin:%(PATH)s",
|
| + "PUB_CACHE": "[CWD]/.pub-cache"
|
| },
|
| "name": "enumerate_xcode_installations",
|
| "~followup_annotations": [
|
|
|