Ensure depot_tools is in path when building and checking out code.
This is to prevent errors when goma and recipes do not find vpython.
Change-Id: I098e35a52e9ac0410bb4d2f8911973a3a520fbc1
Bugs: https://github.com/flutter/flutter/issues/63212
https://github.com/flutter/flutter/issues/63100
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/6080
Reviewed-by: Tong Wu <wutong@google.com>
Reviewed-by: Christopher Fujino <fujino@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/repo_util/__init__.py b/recipe_modules/repo_util/__init__.py
index f65a4cc..e498fa5 100644
--- a/recipe_modules/repo_util/__init__.py
+++ b/recipe_modules/repo_util/__init__.py
@@ -3,6 +3,7 @@
'depot_tools/depot_tools',
'depot_tools/gclient',
'depot_tools/git',
+ 'flutter/flutter_deps',
'recipe_engine/buildbucket',
'recipe_engine/cipd',
'recipe_engine/context',
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index 832b6b7..2382035 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -39,7 +39,8 @@
# Inner function to execute code a second time in case of failure.
def _InnerCheckout():
- with self.m.context(cwd=checkout_path), self.m.depot_tools.on_path():
+ with self.m.context(env=env, env_prefixes=env_prefixes,
+ cwd=checkout_path), self.m.depot_tools.on_path():
src_cfg = self.m.gclient.make_config()
soln = src_cfg.solutions.add()
soln.name = 'src/flutter'
@@ -64,17 +65,14 @@
except (self.m.step.StepFailure, self.m.step.InfraFailure):
# Run this out of context
- # Ensure vpython exists
- ensure_file = self.m.cipd.EnsureFile()
- ensure_file.add_package(
- 'infra/tools/luci/vpython/${platform}', 'latest'
- )
- self.m.cipd.ensure(self.m.path['cache'].join('vpython'), ensure_file)
- self.m.file.rmtree('Clobber cache', checkout_path)
- self.m.file.rmtree(
- 'Clobber git cache', self.m.path['cache'].join('git')
- )
- self.m.file.ensure_directory('Ensure checkout cache', checkout_path)
+ # Ensure depot tools is in the path to prevent problems with vpython not
+ # being found after a failure.
+ with self.m.depot_tools.on_path():
+ self.m.file.rmtree('Clobber cache', checkout_path)
+ self.m.file.rmtree(
+ 'Clobber git cache', self.m.path['cache'].join('git')
+ )
+ self.m.file.ensure_directory('Ensure checkout cache', checkout_path)
# Now try a second time
_InnerCheckout()
diff --git a/recipe_modules/repo_util/examples/full.expected/first_bot_update_failed.json b/recipe_modules/repo_util/examples/full.expected/first_bot_update_failed.json
index 1b1b602..1c7b4ee 100644
--- a/recipe_modules/repo_util/examples/full.expected/first_bot_update_failed.json
+++ b/recipe_modules/repo_util/examples/full.expected/first_bot_update_failed.json
@@ -471,35 +471,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/vpython",
- "-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Checkout source code.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -508,6 +479,14 @@
"rmtree",
"[START_DIR]/engine"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Clobber cache (2)",
"~followup_annotations": [
@@ -524,6 +503,14 @@
"rmtree",
"[CACHE]/git"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Clobber git cache",
"~followup_annotations": [
@@ -542,6 +529,14 @@
"0777",
"[START_DIR]/engine"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Ensure checkout cache (2)",
"~followup_annotations": [
diff --git a/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json b/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
index 52d12ff..d3695df 100644
--- a/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
+++ b/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
@@ -19,7 +19,7 @@
" api.path['start_dir'].join('unsupported_repo'))",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/recipe_api.py\", in _inner",
" return func(*a, **kw)",
- " File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 94, in checkout",
+ " File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 92, in checkout",
" raise ValueError('Unsupported repo: %s' % name)",
"ValueError: Unsupported repo: unsupported_repo"
]
diff --git a/recipes/engine.expected/Linux Fuchsia failing test.json b/recipes/engine.expected/Linux Fuchsia failing test.json
index dad8395..2c44bc1 100644
--- a/recipes/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine.expected/Linux Fuchsia failing test.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3866,9 +3892,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4387,9 +4415,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4815,9 +4845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5503,9 +5535,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6157,9 +6191,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6811,9 +6847,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7545,9 +7583,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8273,9 +8313,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8668,9 +8710,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9062,9 +9106,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9428,9 +9474,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10229,9 +10277,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10595,9 +10645,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11443,9 +11495,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11809,9 +11863,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12557,9 +12613,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12923,9 +12981,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13771,9 +13831,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14137,9 +14199,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14885,9 +14949,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15251,9 +15317,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
index d415bc4..677b3ce 100644
--- a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4163,9 +4189,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4711,9 +4739,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5139,9 +5169,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5809,9 +5841,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6445,9 +6479,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7081,9 +7117,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7689,9 +7727,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8471,9 +8511,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8866,9 +8908,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9260,9 +9304,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9626,9 +9672,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10436,9 +10484,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10802,9 +10852,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11659,9 +11711,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12025,9 +12079,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12782,9 +12838,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13148,9 +13206,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14005,9 +14065,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14371,9 +14433,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15128,9 +15192,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15494,9 +15560,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16708,9 +16776,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -17823,9 +17893,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/clobber.json b/recipes/engine.expected/clobber.json
index aa4c673..10f4c5b 100644
--- a/recipes/engine.expected/clobber.json
+++ b/recipes/engine.expected/clobber.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -185,6 +192,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -537,9 +553,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1099,9 +1117,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1496,9 +1516,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1861,9 +1883,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2258,9 +2282,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3472,9 +3498,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3957,9 +3985,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4385,9 +4415,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4929,9 +4961,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5439,9 +5473,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5949,9 +5985,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6431,9 +6469,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7045,9 +7085,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7440,9 +7482,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7834,9 +7878,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8200,9 +8246,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8821,9 +8869,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9187,9 +9237,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9818,9 +9870,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10184,9 +10238,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10752,9 +10808,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11118,9 +11176,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11749,9 +11809,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12115,9 +12177,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12683,9 +12747,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13049,9 +13115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14082,9 +14150,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15234,9 +15304,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/experimental.json b/recipes/engine.expected/experimental.json
index 918c16c..fa36210 100644
--- a/recipes/engine.expected/experimental.json
+++ b/recipes/engine.expected/experimental.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3470,9 +3496,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3955,9 +3983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4383,9 +4413,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4927,9 +4959,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5437,9 +5471,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5947,9 +5983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6429,9 +6467,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7043,9 +7083,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7438,9 +7480,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7832,9 +7876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8198,9 +8244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8819,9 +8867,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9185,9 +9235,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9816,9 +9868,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10182,9 +10236,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10750,9 +10806,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11116,9 +11174,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11747,9 +11807,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12113,9 +12175,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12681,9 +12745,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13047,9 +13113,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14072,9 +14140,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15187,9 +15257,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index b2bb61e..68f9d92 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3866,9 +3892,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4387,9 +4415,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4815,9 +4845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5503,9 +5535,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6157,9 +6191,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6811,9 +6847,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7545,9 +7583,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8273,9 +8313,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8668,9 +8710,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9062,9 +9106,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9428,9 +9474,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10229,9 +10277,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10595,9 +10645,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11443,9 +11495,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11809,9 +11863,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12557,9 +12613,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12923,9 +12981,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13771,9 +13831,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14137,9 +14199,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14885,9 +14949,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15251,9 +15317,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16672,9 +16740,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -17787,9 +17857,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/first_bot_update_failed.json b/recipes/engine.expected/first_bot_update_failed.json
index 5e42537..68f5d4e 100644
--- a/recipes/engine.expected/first_bot_update_failed.json
+++ b/recipes/engine.expected/first_bot_update_failed.json
@@ -126,8 +126,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,35 +190,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/vpython",
- "-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Checkout source code.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -220,6 +198,14 @@
"rmtree",
"[CACHE]/builder"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Clobber cache (2)",
"~followup_annotations": [
@@ -236,6 +222,14 @@
"rmtree",
"[CACHE]/git"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Clobber git cache",
"~followup_annotations": [
@@ -254,6 +248,14 @@
"0777",
"[CACHE]/builder"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Ensure checkout cache (2)",
"~followup_annotations": [
@@ -284,8 +286,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -346,6 +355,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -698,9 +716,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1260,9 +1280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1657,9 +1679,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2022,9 +2046,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2419,9 +2445,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3633,9 +3661,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4118,9 +4148,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4546,9 +4578,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5090,9 +5124,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5600,9 +5636,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6110,9 +6148,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6592,9 +6632,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7206,9 +7248,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7601,9 +7645,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7995,9 +8041,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8361,9 +8409,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8982,9 +9032,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9348,9 +9400,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9979,9 +10033,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10345,9 +10401,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10913,9 +10971,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11279,9 +11339,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11910,9 +11972,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12276,9 +12340,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12844,9 +12910,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13210,9 +13278,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14243,9 +14313,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15358,9 +15430,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux.json b/recipes/engine.expected/linux.json
index 5a9fd27..4a6c389 100644
--- a/recipes/engine.expected/linux.json
+++ b/recipes/engine.expected/linux.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3470,9 +3496,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3955,9 +3983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4383,9 +4413,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4927,9 +4959,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5437,9 +5471,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5947,9 +5983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6429,9 +6467,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7043,9 +7083,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7438,9 +7480,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7832,9 +7876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8198,9 +8244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8819,9 +8867,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9185,9 +9235,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9816,9 +9868,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10182,9 +10236,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10750,9 +10806,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11116,9 +11174,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11747,9 +11807,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12113,9 +12175,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12681,9 +12745,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13047,9 +13113,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14072,9 +14140,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15187,9 +15257,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_maven_or_bitcode.json b/recipes/engine.expected/linux_maven_or_bitcode.json
index 5a9fd27..4a6c389 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3470,9 +3496,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3955,9 +3983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4383,9 +4413,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4927,9 +4959,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5437,9 +5471,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5947,9 +5983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6429,9 +6467,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7043,9 +7083,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7438,9 +7480,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7832,9 +7876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8198,9 +8244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8819,9 +8867,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9185,9 +9235,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9816,9 +9868,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10182,9 +10236,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10750,9 +10806,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11116,9 +11174,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11747,9 +11807,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12113,9 +12175,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12681,9 +12745,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13047,9 +13113,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14072,9 +14140,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15187,9 +15257,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
index 3033563..7ae2f79 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -536,9 +552,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1101,9 +1119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1498,9 +1518,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1863,9 +1885,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2260,9 +2284,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3475,9 +3501,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3961,9 +3989,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4389,9 +4419,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4933,9 +4965,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5443,9 +5477,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5953,9 +5989,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6435,9 +6473,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7050,9 +7090,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7445,9 +7487,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7840,9 +7884,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8206,9 +8252,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8828,9 +8876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9194,9 +9244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9826,9 +9878,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10192,9 +10246,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10761,9 +10817,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11127,9 +11185,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11759,9 +11819,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12125,9 +12187,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12694,9 +12758,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13060,9 +13126,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14085,9 +14153,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15200,9 +15270,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
index 5a9fd27..4a6c389 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3470,9 +3496,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3955,9 +3983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4383,9 +4413,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4927,9 +4959,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5437,9 +5471,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5947,9 +5983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6429,9 +6467,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7043,9 +7083,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7438,9 +7480,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7832,9 +7876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8198,9 +8244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8819,9 +8867,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9185,9 +9235,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9816,9 +9868,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10182,9 +10236,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10750,9 +10806,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11116,9 +11174,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11747,9 +11807,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12113,9 +12175,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12681,9 +12745,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13047,9 +13113,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14072,9 +14140,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15187,9 +15257,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
index 3033563..7ae2f79 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -536,9 +552,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1101,9 +1119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1498,9 +1518,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1863,9 +1885,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2260,9 +2284,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3475,9 +3501,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3961,9 +3989,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4389,9 +4419,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4933,9 +4965,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5443,9 +5477,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5953,9 +5989,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6435,9 +6473,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7050,9 +7090,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7445,9 +7487,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7840,9 +7884,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8206,9 +8252,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8828,9 +8876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9194,9 +9244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9826,9 +9878,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10192,9 +10246,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10761,9 +10817,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11127,9 +11185,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11759,9 +11819,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12125,9 +12187,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12694,9 +12758,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13060,9 +13126,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14085,9 +14153,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15200,9 +15270,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_no_lto.json b/recipes/engine.expected/linux_no_lto.json
index 3033563..7ae2f79 100644
--- a/recipes/engine.expected/linux_no_lto.json
+++ b/recipes/engine.expected/linux_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -536,9 +552,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1101,9 +1119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1498,9 +1518,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1863,9 +1885,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2260,9 +2284,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3475,9 +3501,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3961,9 +3989,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4389,9 +4419,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4933,9 +4965,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5443,9 +5477,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5953,9 +5989,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6435,9 +6473,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7050,9 +7090,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7445,9 +7487,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7840,9 +7884,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8206,9 +8252,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8828,9 +8876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9194,9 +9244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9826,9 +9878,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10192,9 +10246,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10761,9 +10817,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11127,9 +11185,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11759,9 +11819,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12125,9 +12187,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12694,9 +12758,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13060,9 +13126,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14085,9 +14153,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15200,9 +15270,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_publish_cipd.json b/recipes/engine.expected/linux_publish_cipd.json
index 5a9fd27..4a6c389 100644
--- a/recipes/engine.expected/linux_publish_cipd.json
+++ b/recipes/engine.expected/linux_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3470,9 +3496,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3955,9 +3983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4383,9 +4413,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4927,9 +4959,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5437,9 +5471,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5947,9 +5983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6429,9 +6467,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7043,9 +7083,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7438,9 +7480,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7832,9 +7876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8198,9 +8244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8819,9 +8867,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9185,9 +9235,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9816,9 +9868,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10182,9 +10236,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10750,9 +10806,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11116,9 +11174,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11747,9 +11807,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12113,9 +12175,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12681,9 +12745,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13047,9 +13113,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14072,9 +14140,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15187,9 +15257,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_publish_cipd_no_lto.json b/recipes/engine.expected/linux_publish_cipd_no_lto.json
index 3033563..7ae2f79 100644
--- a/recipes/engine.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_publish_cipd_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -536,9 +552,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1101,9 +1119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1498,9 +1518,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1863,9 +1885,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2260,9 +2284,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3475,9 +3501,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3961,9 +3989,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4389,9 +4419,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4933,9 +4965,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5443,9 +5477,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5953,9 +5989,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6435,9 +6473,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7050,9 +7090,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7445,9 +7487,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7840,9 +7884,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8206,9 +8252,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8828,9 +8876,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9194,9 +9244,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9826,9 +9878,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10192,9 +10246,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10761,9 +10817,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11127,9 +11185,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11759,9 +11819,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12125,9 +12187,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12694,9 +12758,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13060,9 +13126,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14085,9 +14153,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15200,9 +15270,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index 1aefc7f..1abd94e 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3866,9 +3892,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4387,9 +4415,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4815,9 +4845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5503,9 +5535,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6157,9 +6191,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6811,9 +6847,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7545,9 +7583,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8273,9 +8313,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8668,9 +8710,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9062,9 +9106,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9428,9 +9474,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10229,9 +10277,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10595,9 +10645,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11443,9 +11495,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11809,9 +11863,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12557,9 +12613,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12923,9 +12981,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13771,9 +13831,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14137,9 +14199,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14885,9 +14949,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15251,9 +15317,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16672,9 +16740,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -17787,9 +17857,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode.json b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
index daed87e..55f35e5 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3866,9 +3892,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4387,9 +4415,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4815,9 +4845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5431,9 +5463,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6013,9 +6047,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6595,9 +6631,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7149,9 +7187,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7877,9 +7917,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8272,9 +8314,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8666,9 +8710,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9032,9 +9078,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9761,9 +9809,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10127,9 +10177,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10903,9 +10955,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11269,9 +11323,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11945,9 +12001,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12311,9 +12369,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13087,9 +13147,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13453,9 +13515,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14129,9 +14193,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14495,9 +14561,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15628,9 +15696,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16743,9 +16813,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
index 05dae6c..c36d41b 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -536,9 +552,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1101,9 +1119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1498,9 +1518,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1863,9 +1885,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2260,9 +2284,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3871,9 +3897,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4393,9 +4421,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4821,9 +4851,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5437,9 +5469,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6019,9 +6053,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6601,9 +6637,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7155,9 +7193,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7884,9 +7924,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8279,9 +8321,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8674,9 +8718,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9040,9 +9086,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9770,9 +9818,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10136,9 +10186,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10913,9 +10965,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11279,9 +11333,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11956,9 +12012,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12322,9 +12380,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13099,9 +13159,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13465,9 +13527,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14142,9 +14206,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14508,9 +14574,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15641,9 +15709,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16756,9 +16826,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index 35df3f3..52373b9 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3866,9 +3892,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4387,9 +4415,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4815,9 +4845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5431,9 +5463,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6013,9 +6047,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6595,9 +6631,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7149,9 +7187,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7877,9 +7917,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8272,9 +8314,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8666,9 +8710,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9032,9 +9078,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9761,9 +9809,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10127,9 +10177,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10903,9 +10955,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11269,9 +11323,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11945,9 +12001,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12311,9 +12369,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13087,9 +13147,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13453,9 +13515,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14129,9 +14193,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14495,9 +14561,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15628,9 +15696,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16743,9 +16813,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 8f02926..29271b1 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -536,9 +552,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1101,9 +1119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1498,9 +1518,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1863,9 +1885,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2260,9 +2284,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3871,9 +3897,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4393,9 +4421,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4821,9 +4851,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5437,9 +5469,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6019,9 +6053,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6601,9 +6637,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7155,9 +7193,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7884,9 +7924,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8279,9 +8321,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8674,9 +8718,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9040,9 +9086,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9770,9 +9818,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10136,9 +10186,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10913,9 +10965,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11279,9 +11333,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11956,9 +12012,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12322,9 +12380,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13099,9 +13159,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13465,9 +13527,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14142,9 +14206,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14508,9 +14574,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15641,9 +15709,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16756,9 +16826,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_upload_no_lto.json b/recipes/engine.expected/linux_upload_no_lto.json
index 535c182..0166c52 100644
--- a/recipes/engine.expected/linux_upload_no_lto.json
+++ b/recipes/engine.expected/linux_upload_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -536,9 +552,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1101,9 +1119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1498,9 +1518,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1863,9 +1885,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2260,9 +2284,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3871,9 +3897,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4393,9 +4421,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4821,9 +4851,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5509,9 +5541,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6163,9 +6197,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6817,9 +6853,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7551,9 +7589,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8280,9 +8320,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8675,9 +8717,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9070,9 +9114,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9436,9 +9482,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10238,9 +10286,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10604,9 +10654,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11453,9 +11505,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11819,9 +11873,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12568,9 +12624,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12934,9 +12992,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13783,9 +13843,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14149,9 +14211,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14898,9 +14962,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15264,9 +15330,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16685,9 +16753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -17800,9 +17870,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_upload_publish_cipd.json b/recipes/engine.expected/linux_upload_publish_cipd.json
index ce6726c..3148825 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -535,9 +551,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1097,9 +1115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1494,9 +1514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1859,9 +1881,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2256,9 +2280,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3866,9 +3892,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4387,9 +4415,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4815,9 +4845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5503,9 +5535,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6157,9 +6191,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6811,9 +6847,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7545,9 +7583,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8273,9 +8313,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8668,9 +8710,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9062,9 +9106,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9428,9 +9474,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10229,9 +10277,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10595,9 +10645,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11443,9 +11495,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11809,9 +11863,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12557,9 +12613,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12923,9 +12981,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13771,9 +13831,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14137,9 +14199,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14885,9 +14949,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15251,9 +15317,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16672,9 +16740,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -17787,9 +17857,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
index 7658f0e..c2cdf0d 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -536,9 +552,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1101,9 +1119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1498,9 +1518,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1863,9 +1885,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2260,9 +2284,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3871,9 +3897,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4393,9 +4421,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4821,9 +4851,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5509,9 +5541,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6163,9 +6197,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6817,9 +6853,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7551,9 +7589,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8280,9 +8320,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8675,9 +8717,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9070,9 +9114,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9436,9 +9482,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10238,9 +10286,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10604,9 +10654,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11453,9 +11505,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11819,9 +11873,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12568,9 +12624,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12934,9 +12992,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13783,9 +13843,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14149,9 +14211,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14898,9 +14962,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15264,9 +15330,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -16685,9 +16753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -17800,9 +17870,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac.json b/recipes/engine.expected/mac.json
index 9dc2a36..83fa124 100644
--- a/recipes/engine.expected/mac.json
+++ b/recipes/engine.expected/mac.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3094,9 +3118,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3638,9 +3664,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4004,9 +4032,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4370,9 +4400,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4736,9 +4768,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5102,9 +5136,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5468,9 +5504,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6326,9 +6364,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6738,9 +6778,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7122,9 +7164,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9205,9 +9249,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9604,9 +9650,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_maven_or_bitcode.json b/recipes/engine.expected/mac_maven_or_bitcode.json
index 4dceb2b..275b11e 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3094,9 +3118,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3638,9 +3664,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4004,9 +4032,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4370,9 +4400,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4736,9 +4768,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5102,9 +5136,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5468,9 +5504,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6326,9 +6364,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6738,9 +6778,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7122,9 +7164,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7631,9 +7675,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8014,9 +8060,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8706,9 +8754,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9089,9 +9139,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9692,9 +9744,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10075,9 +10129,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11128,9 +11184,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11527,9 +11585,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
index 180f9af..f23f07a 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3095,9 +3119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3645,9 +3671,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4011,9 +4039,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4377,9 +4407,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4743,9 +4775,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5109,9 +5143,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5475,9 +5511,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6333,9 +6371,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6746,9 +6786,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7130,9 +7172,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7641,9 +7685,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8024,9 +8070,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8718,9 +8766,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9101,9 +9151,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9706,9 +9758,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10089,9 +10143,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11142,9 +11198,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11541,9 +11599,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
index 4dceb2b..275b11e 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3094,9 +3118,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3638,9 +3664,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4004,9 +4032,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4370,9 +4400,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4736,9 +4768,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5102,9 +5136,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5468,9 +5504,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6326,9 +6364,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6738,9 +6778,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7122,9 +7164,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7631,9 +7675,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8014,9 +8060,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8706,9 +8754,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9089,9 +9139,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9692,9 +9744,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10075,9 +10129,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11128,9 +11184,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11527,9 +11585,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 180f9af..f23f07a 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3095,9 +3119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3645,9 +3671,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4011,9 +4039,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4377,9 +4407,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4743,9 +4775,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5109,9 +5143,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5475,9 +5511,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6333,9 +6371,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6746,9 +6786,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7130,9 +7172,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7641,9 +7685,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8024,9 +8070,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8718,9 +8766,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9101,9 +9151,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9706,9 +9758,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10089,9 +10143,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11142,9 +11198,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11541,9 +11599,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_no_lto.json b/recipes/engine.expected/mac_no_lto.json
index 587d6e6..34b3fbc 100644
--- a/recipes/engine.expected/mac_no_lto.json
+++ b/recipes/engine.expected/mac_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3095,9 +3119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3645,9 +3671,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4011,9 +4039,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4377,9 +4407,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4743,9 +4775,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5109,9 +5143,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5475,9 +5511,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6333,9 +6371,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6746,9 +6786,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7130,9 +7172,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9219,9 +9263,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9618,9 +9664,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_publish_cipd.json b/recipes/engine.expected/mac_publish_cipd.json
index 9dc2a36..83fa124 100644
--- a/recipes/engine.expected/mac_publish_cipd.json
+++ b/recipes/engine.expected/mac_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3094,9 +3118,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3638,9 +3664,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4004,9 +4032,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4370,9 +4400,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4736,9 +4768,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5102,9 +5136,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5468,9 +5504,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6326,9 +6364,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6738,9 +6778,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7122,9 +7164,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9205,9 +9249,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9604,9 +9650,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_publish_cipd_no_lto.json b/recipes/engine.expected/mac_publish_cipd_no_lto.json
index 587d6e6..34b3fbc 100644
--- a/recipes/engine.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_publish_cipd_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3095,9 +3119,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3645,9 +3671,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4011,9 +4039,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4377,9 +4407,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4743,9 +4775,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5109,9 +5143,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5475,9 +5511,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6333,9 +6371,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6746,9 +6786,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7130,9 +7172,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9219,9 +9263,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9618,9 +9664,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_upload.json b/recipes/engine.expected/mac_upload.json
index bb389c2..17d2b32 100644
--- a/recipes/engine.expected/mac_upload.json
+++ b/recipes/engine.expected/mac_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3490,9 +3514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4034,9 +4060,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4400,9 +4428,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4766,9 +4796,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5132,9 +5164,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5498,9 +5532,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5864,9 +5900,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6938,9 +6976,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7350,9 +7390,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7734,9 +7776,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10083,9 +10127,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10482,9 +10528,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode.json b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
index e30b8d5..d21cab2 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3490,9 +3514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4034,9 +4060,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4400,9 +4428,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4766,9 +4796,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5132,9 +5164,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5498,9 +5532,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5864,9 +5900,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6938,9 +6976,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7350,9 +7390,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7734,9 +7776,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8243,9 +8287,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8626,9 +8672,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9394,9 +9442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9777,9 +9827,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10418,9 +10470,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10801,9 +10855,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11930,9 +11986,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12329,9 +12387,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
index 3e2030b..d316b7e 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3491,9 +3515,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4041,9 +4067,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4407,9 +4435,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4773,9 +4803,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5139,9 +5171,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5505,9 +5539,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5871,9 +5907,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6945,9 +6983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7358,9 +7398,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7742,9 +7784,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8253,9 +8297,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8636,9 +8682,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9406,9 +9454,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9789,9 +9839,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10432,9 +10484,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10815,9 +10869,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11944,9 +12000,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12343,9 +12401,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index e30b8d5..d21cab2 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3490,9 +3514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4034,9 +4060,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4400,9 +4428,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4766,9 +4796,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5132,9 +5164,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5498,9 +5532,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5864,9 +5900,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6938,9 +6976,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7350,9 +7390,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7734,9 +7776,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8243,9 +8287,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8626,9 +8672,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9394,9 +9442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9777,9 +9827,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10418,9 +10470,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10801,9 +10855,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11930,9 +11986,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12329,9 +12387,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 3e2030b..d316b7e 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3491,9 +3515,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4041,9 +4067,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4407,9 +4435,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4773,9 +4803,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5139,9 +5171,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5505,9 +5539,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5871,9 +5907,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6945,9 +6983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7358,9 +7398,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7742,9 +7784,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8253,9 +8297,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8636,9 +8682,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9406,9 +9454,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9789,9 +9839,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10432,9 +10484,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10815,9 +10869,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11944,9 +12000,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12343,9 +12401,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_upload_no_lto.json b/recipes/engine.expected/mac_upload_no_lto.json
index 48bd142..c3114a7 100644
--- a/recipes/engine.expected/mac_upload_no_lto.json
+++ b/recipes/engine.expected/mac_upload_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3491,9 +3515,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4041,9 +4067,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4407,9 +4435,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4773,9 +4803,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5139,9 +5171,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5505,9 +5539,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5871,9 +5907,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6945,9 +6983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7358,9 +7398,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7742,9 +7784,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10097,9 +10141,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10496,9 +10542,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_upload_publish_cipd.json b/recipes/engine.expected/mac_upload_publish_cipd.json
index bb389c2..17d2b32 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3490,9 +3514,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4034,9 +4060,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4400,9 +4428,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4766,9 +4796,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5132,9 +5164,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5498,9 +5532,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5864,9 +5900,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6938,9 +6976,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7350,9 +7390,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7734,9 +7776,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10083,9 +10127,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10482,9 +10528,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
index 48bd142..c3114a7 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -737,9 +753,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1191,9 +1209,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1556,9 +1576,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1953,9 +1975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3491,9 +3515,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4041,9 +4067,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4407,9 +4435,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4773,9 +4803,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5139,9 +5171,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5505,9 +5539,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5871,9 +5907,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6945,9 +6983,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7358,9 +7398,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7742,9 +7784,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10097,9 +10141,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10496,9 +10542,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/pull_request.json b/recipes/engine.expected/pull_request.json
index 35de62d..b6ff295 100644
--- a/recipes/engine.expected/pull_request.json
+++ b/recipes/engine.expected/pull_request.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -185,6 +192,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -537,9 +553,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1099,9 +1117,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1496,9 +1516,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1861,9 +1883,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2258,9 +2282,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3472,9 +3498,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3957,9 +3985,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4385,9 +4415,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4929,9 +4961,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5439,9 +5473,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5949,9 +5985,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -6431,9 +6469,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7045,9 +7085,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7440,9 +7482,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -7834,9 +7878,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8200,9 +8246,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -8821,9 +8869,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9187,9 +9237,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -9818,9 +9870,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10184,9 +10238,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -10752,9 +10808,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11118,9 +11176,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -11749,9 +11809,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12115,9 +12177,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -12683,9 +12747,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -13049,9 +13115,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -14082,9 +14150,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -15197,9 +15267,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/safeupload_raise_on_duplicate.json b/recipes/engine.expected/safeupload_raise_on_duplicate.json
index 3b120b4..cc455ad 100644
--- a/recipes/engine.expected/safeupload_raise_on_duplicate.json
+++ b/recipes/engine.expected/safeupload_raise_on_duplicate.json
@@ -119,8 +119,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +188,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -531,9 +547,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -957,9 +975,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1275,9 +1295,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1561,9 +1583,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1879,9 +1903,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2227,11 +2253,11 @@
" raw_result = recipe_obj.run_steps(api, engine)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps",
" recipe_result = self.global_symbols['RunSteps'](*args)",
- " File \"RECIPE_REPO[flutter]/recipes/engine.py\", line 1454, in RunSteps",
+ " File \"RECIPE_REPO[flutter]/recipes/engine.py\", line 1598, in RunSteps",
" BuildLinux(api)",
- " File \"RECIPE_REPO[flutter]/recipes/engine.py\", line 602, in BuildLinux",
+ " File \"RECIPE_REPO[flutter]/recipes/engine.py\", line 647, in BuildLinux",
" 'out/host_debug_unopt/gen/frontend_server.dart.snapshot',",
- " File \"RECIPE_REPO[flutter]/recipes/engine.py\", line 222, in UploadArtifacts",
+ " File \"RECIPE_REPO[flutter]/recipes/engine.py\", line 228, in UploadArtifacts",
" api.bucket_util.safe_upload(local_zip, remote_zip)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/recipe_api.py\", in _inner",
" return func(*a, **kw)",
diff --git a/recipes/engine.expected/win.json b/recipes/engine.expected/win.json
index 1a8b842..2c62241 100644
--- a/recipes/engine.expected/win.json
+++ b/recipes/engine.expected/win.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -990,9 +1008,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1422,9 +1442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1822,9 +1844,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2192,9 +2216,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3320,9 +3346,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3690,9 +3718,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4060,9 +4090,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4430,9 +4462,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4800,9 +4834,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5170,9 +5206,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_maven_or_bitcode.json b/recipes/engine.expected/win_maven_or_bitcode.json
index 1a8b842..2c62241 100644
--- a/recipes/engine.expected/win_maven_or_bitcode.json
+++ b/recipes/engine.expected/win_maven_or_bitcode.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -990,9 +1008,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1422,9 +1442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1822,9 +1844,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2192,9 +2216,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3320,9 +3346,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3690,9 +3718,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4060,9 +4090,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4430,9 +4462,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4800,9 +4834,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5170,9 +5206,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_maven_or_bitcode_no_lto.json b/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
index d6cbd06..19e1cbe 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -991,9 +1009,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1423,9 +1443,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1823,9 +1845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2193,9 +2217,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3327,9 +3353,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3697,9 +3725,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4067,9 +4097,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4437,9 +4469,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4807,9 +4841,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5177,9 +5213,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
index 1a8b842..2c62241 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -990,9 +1008,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1422,9 +1442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1822,9 +1844,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2192,9 +2216,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3320,9 +3346,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3690,9 +3718,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4060,9 +4090,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4430,9 +4462,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4800,9 +4834,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5170,9 +5206,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
index d6cbd06..19e1cbe 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -991,9 +1009,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1423,9 +1443,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1823,9 +1845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2193,9 +2217,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3327,9 +3353,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3697,9 +3725,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4067,9 +4097,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4437,9 +4469,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4807,9 +4841,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5177,9 +5213,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_no_lto.json b/recipes/engine.expected/win_no_lto.json
index d6cbd06..19e1cbe 100644
--- a/recipes/engine.expected/win_no_lto.json
+++ b/recipes/engine.expected/win_no_lto.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -991,9 +1009,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1423,9 +1443,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1823,9 +1845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2193,9 +2217,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3327,9 +3353,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3697,9 +3725,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4067,9 +4097,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4437,9 +4469,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4807,9 +4841,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5177,9 +5213,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_publish_cipd.json b/recipes/engine.expected/win_publish_cipd.json
index 1a8b842..2c62241 100644
--- a/recipes/engine.expected/win_publish_cipd.json
+++ b/recipes/engine.expected/win_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -990,9 +1008,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1422,9 +1442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1822,9 +1844,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2192,9 +2216,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3320,9 +3346,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3690,9 +3718,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4060,9 +4090,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4430,9 +4462,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4800,9 +4834,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5170,9 +5206,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_publish_cipd_no_lto.json b/recipes/engine.expected/win_publish_cipd_no_lto.json
index d6cbd06..19e1cbe 100644
--- a/recipes/engine.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_publish_cipd_no_lto.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -991,9 +1009,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1423,9 +1443,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1823,9 +1845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2193,9 +2217,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3327,9 +3353,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3697,9 +3725,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4067,9 +4097,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4437,9 +4469,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4807,9 +4841,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5177,9 +5213,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_upload.json b/recipes/engine.expected/win_upload.json
index 83cc75e..fafc502 100644
--- a/recipes/engine.expected/win_upload.json
+++ b/recipes/engine.expected/win_upload.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -990,9 +1008,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1422,9 +1442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1822,9 +1844,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2192,9 +2216,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3680,9 +3706,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4050,9 +4078,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4420,9 +4450,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4790,9 +4822,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5160,9 +5194,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5530,9 +5566,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode.json b/recipes/engine.expected/win_upload_maven_or_bitcode.json
index 83cc75e..fafc502 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -990,9 +1008,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1422,9 +1442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1822,9 +1844,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2192,9 +2216,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3680,9 +3706,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4050,9 +4078,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4420,9 +4450,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4790,9 +4822,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5160,9 +5194,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5530,9 +5566,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
index d40d9e9..2e243c7 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -991,9 +1009,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1423,9 +1443,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1823,9 +1845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2193,9 +2217,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3687,9 +3713,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4057,9 +4085,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4427,9 +4457,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4797,9 +4829,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5167,9 +5201,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5537,9 +5573,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
index 83cc75e..fafc502 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -990,9 +1008,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1422,9 +1442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1822,9 +1844,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2192,9 +2216,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3680,9 +3706,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4050,9 +4078,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4420,9 +4450,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4790,9 +4822,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5160,9 +5194,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5530,9 +5566,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
index d40d9e9..2e243c7 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -991,9 +1009,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1423,9 +1443,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1823,9 +1845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2193,9 +2217,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3687,9 +3713,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4057,9 +4085,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4427,9 +4457,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4797,9 +4829,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5167,9 +5201,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5537,9 +5573,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_upload_no_lto.json b/recipes/engine.expected/win_upload_no_lto.json
index d40d9e9..2e243c7 100644
--- a/recipes/engine.expected/win_upload_no_lto.json
+++ b/recipes/engine.expected/win_upload_no_lto.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -991,9 +1009,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1423,9 +1443,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1823,9 +1845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2193,9 +2217,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3687,9 +3713,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4057,9 +4085,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4427,9 +4457,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4797,9 +4829,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5167,9 +5201,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5537,9 +5573,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_upload_publish_cipd.json b/recipes/engine.expected/win_upload_publish_cipd.json
index 83cc75e..fafc502 100644
--- a/recipes/engine.expected/win_upload_publish_cipd.json
+++ b/recipes/engine.expected/win_upload_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -990,9 +1008,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1422,9 +1442,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1822,9 +1844,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2192,9 +2216,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3680,9 +3706,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4050,9 +4078,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4420,9 +4450,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4790,9 +4822,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5160,9 +5194,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5530,9 +5566,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
index d40d9e9..2e243c7 100644
--- a/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -503,9 +519,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -991,9 +1009,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1423,9 +1443,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -1823,9 +1845,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -2193,9 +2217,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -3687,9 +3713,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4057,9 +4085,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4427,9 +4457,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -4797,9 +4829,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5167,9 +5201,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
@@ -5537,9 +5573,11 @@
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
+ "0",
"0"
],
"PATH": [
+ "RECIPE_REPO[depot_tools]",
"RECIPE_REPO[depot_tools]"
]
},
diff --git a/recipes/engine.py b/recipes/engine.py
index cdfd67e..0043831 100644
--- a/recipes/engine.py
+++ b/recipes/engine.py
@@ -47,7 +47,8 @@
FUCHSIA_ARTIFACTS_DEBUG_NAMESPACE = 'debug'
ICU_DATA_PATH = 'third_party/icu/flutter/icudtl.dat'
GIT_REPO = (
- 'https://chromium.googlesource.com/external/github.com/flutter/engine')
+ 'https://chromium.googlesource.com/external/github.com/flutter/engine'
+)
PROPERTIES = InputProperties
ENV_PROPERTIES = EnvProperties
@@ -74,7 +75,7 @@
goma_jobs = api.properties['goma_jobs']
ninja_args = [api.depot_tools.ninja_path, '-j', goma_jobs, '-C', build_dir]
ninja_args.extend(targets)
- with api.goma.build_with_goma():
+ with api.goma.build_with_goma(), api.depot_tools.on_path():
name = 'build %s' % ' '.join([config] + list(targets))
api.step(name, ninja_args)
@@ -117,7 +118,8 @@
# Increasing priority won't fix the problem but will make the deadlock
# situation less unlikely.
# https://github.com/flutter/flutter/issues/59169.
- priority=25)
+ priority=25
+ )
return api.buildbucket.schedule([req])
@@ -162,8 +164,10 @@
def BuildAndTestFuchsia(api, build_script, git_rev):
- RunGN(api, '--fuchsia', '--fuchsia-cpu', 'x64', '--runtime-mode', 'debug',
- '--no-lto')
+ RunGN(
+ api, '--fuchsia', '--fuchsia-cpu', 'x64', '--runtime-mode', 'debug',
+ '--no-lto'
+ )
Build(api, 'fuchsia_debug_x64', *GetFlutterFuchsiaBuildTargets(False, True))
fuchsia_package_cmd = [
@@ -175,8 +179,10 @@
api.step('Package Fuchsia Artifacts', fuchsia_package_cmd)
TestFuchsia(api)
- RunGN(api, '--fuchsia', '--fuchsia-cpu', 'arm64', '--runtime-mode', 'debug',
- '--no-lto')
+ RunGN(
+ api, '--fuchsia', '--fuchsia-cpu', 'arm64', '--runtime-mode', 'debug',
+ '--no-lto'
+ )
Build(api, 'fuchsia_debug_arm64', *GetFlutterFuchsiaBuildTargets(False, True))
@@ -215,7 +221,7 @@
remote_name = '%s/%s' % (platform, archive_name)
remote_zip = GetCloudPath(api, remote_name)
pkg = api.zip.make_package(GetCheckoutPath(api), local_zip)
- api.bucket_util.add_files( pkg, file_paths)
+ api.bucket_util.add_files(pkg, file_paths)
pkg.zip('Zip %s %s' % (platform, archive_name))
if api.bucket_util.should_upload_packages():
@@ -242,8 +248,9 @@
filename_pattern = '%s-1.0.0-%s.%s'
artifact_id = artifact_id.replace('-sources', '')
- filename = filename_pattern % (artifact_id, engine_git_hash,
- artifact_extension)
+ filename = filename_pattern % (
+ artifact_id, engine_git_hash, artifact_extension
+ )
return 'io/flutter/%s/1.0.0-%s/%s' % (artifact_id, engine_git_hash, filename)
@@ -260,17 +267,19 @@
filename = api.path.basename(local_artifact)
remote_artifact = GetCloudMavenPath(api, filename, swarming_task_id)
- api.bucket_util.safe_upload(checkout.join(local_artifact),
- remote_artifact,
- bucket_name=MAVEN_BUCKET_NAME)
+ api.bucket_util.safe_upload(
+ checkout.join(local_artifact),
+ remote_artifact,
+ bucket_name=MAVEN_BUCKET_NAME
+ )
def UploadDartPackage(api, package_name):
api.bucket_util.upload_folder(
'UploadDartPackage %s' % package_name,
- 'src/out/android_debug/dist/packages',
- package_name,
- "%s.zip" % package_name)
+ 'src/out/android_debug/dist/packages', package_name,
+ "%s.zip" % package_name
+ )
def UploadSkyEngineToCIPD(api, package_name):
@@ -282,13 +291,15 @@
zip_path = temp_dir.join('%s.zip' % package_name)
cipd_package_name = 'flutter/%s' % package_name
api.cipd.build(
- folder_path, zip_path, cipd_package_name, install_mode='copy')
+ folder_path, zip_path, cipd_package_name, install_mode='copy'
+ )
if api.bucket_util.should_upload_packages():
api.cipd.register(
cipd_package_name,
zip_path,
refs=['latest'],
- tags={'git_revision': git_rev})
+ tags={'git_revision': git_rev}
+ )
def UploadSkyEngineDartPackage(api):
@@ -298,41 +309,37 @@
def UploadFlutterPatchedSdk(api):
api.bucket_util.upload_folder(
- 'Upload Flutter patched sdk',
- 'src/out/host_debug',
- 'flutter_patched_sdk',
- 'flutter_patched_sdk.zip')
+ 'Upload Flutter patched sdk', 'src/out/host_debug', 'flutter_patched_sdk',
+ 'flutter_patched_sdk.zip'
+ )
host_release_path = GetCheckoutPath(api).join('out/host_release')
flutter_patched_sdk_product = host_release_path.join(
- 'flutter_patched_sdk_product')
- api.file.rmtree('Remove stale flutter_patched_sdk_product',
- flutter_patched_sdk_product)
+ 'flutter_patched_sdk_product'
+ )
+ api.file.rmtree(
+ 'Remove stale flutter_patched_sdk_product', flutter_patched_sdk_product
+ )
api.file.move(
'Move release flutter_patched_sdk to flutter_patched_sdk_product',
- host_release_path.join('flutter_patched_sdk'),
- flutter_patched_sdk_product)
+ host_release_path.join('flutter_patched_sdk'), flutter_patched_sdk_product
+ )
api.bucket_util.upload_folder(
- 'Upload Product Flutter patched sdk',
- 'src/out/host_release',
- 'flutter_patched_sdk_product',
- 'flutter_patched_sdk_product.zip')
+ 'Upload Product Flutter patched sdk', 'src/out/host_release',
+ 'flutter_patched_sdk_product', 'flutter_patched_sdk_product.zip'
+ )
def UploadDartSdk(api, archive_name):
api.bucket_util.upload_folder(
- 'Upload Dart SDK',
- 'src/out/host_debug',
- 'dart-sdk',
- archive_name)
+ 'Upload Dart SDK', 'src/out/host_debug', 'dart-sdk', archive_name
+ )
def UploadWebSdk(api, archive_name):
api.bucket_util.upload_folder(
- 'Upload Web SDK',
- 'src/out/host_debug',
- 'flutter_web_sdk',
- archive_name)
+ 'Upload Web SDK', 'src/out/host_debug', 'flutter_web_sdk', archive_name
+ )
def AnalyzeDartUI(api):
@@ -365,8 +372,10 @@
script_path = script_dir.join('verify_exported.dart')
with api.context(cwd=script_dir):
api.step('pub get for verify_exported.dart', ['pub', 'get'])
- api.step('Verify exported symbols on release binaries',
- ['dart', script_path, out_dir])
+ api.step(
+ 'Verify exported symbols on release binaries',
+ ['dart', script_path, out_dir]
+ )
def UploadTreeMap(api, upload_dir, lib_flutter_path, android_triple):
@@ -374,13 +383,14 @@
checkout = GetCheckoutPath(api)
script_path = checkout.join(
'third_party/dart/runtime/'
- 'third_party/binary_size/src/run_binary_size_analysis.py')
+ 'third_party/binary_size/src/run_binary_size_analysis.py'
+ )
library_path = checkout.join(lib_flutter_path)
destination_dir = temp_dir.join('sizes')
- addr2line = checkout.join('third_party/android_tools/ndk/toolchains/' +
- android_triple +
- '-4.9/prebuilt/linux-x86_64/bin/' +
- android_triple + '-addr2line')
+ addr2line = checkout.join(
+ 'third_party/android_tools/ndk/toolchains/' + android_triple +
+ '-4.9/prebuilt/linux-x86_64/bin/' + android_triple + '-addr2line'
+ )
args = [
'--library', library_path, '--destdir', destination_dir,
"--addr2line-binary", addr2line
@@ -397,15 +407,17 @@
remote_name,
args=['-r'],
name='upload treemap for %s' % lib_flutter_path,
- link_name=None)
+ link_name=None
+ )
result.presentation.links['Open Treemap'] = (
'https://storage.googleapis.com/%s/%s/sizes/index.html' %
- (BUCKET_NAME, remote_name))
+ (BUCKET_NAME, remote_name)
+ )
def LintAndroidHost(api):
- android_lint_path = GetCheckoutPath(api).join('flutter', 'tools',
- 'android_lint')
+ android_lint_path = GetCheckoutPath(api
+ ).join('flutter', 'tools', 'android_lint')
with api.step.nest('android lint'):
with api.context(cwd=android_lint_path):
api.step('pub get', ['pub', 'get'])
@@ -415,13 +427,17 @@
def BuildLinuxAndroid(api, swarming_task_id):
if api.properties.get('build_android_jit_release', True):
jit_release_variants = [
- ('x86', 'android_jit_release_x86', 'android-x86-jit-release', True,
- 'x86'),
+ (
+ 'x86', 'android_jit_release_x86', 'android-x86-jit-release', True,
+ 'x86'
+ ),
]
for android_cpu, out_dir, artifact_dir, \
run_tests, abi in jit_release_variants:
- RunGN(api, '--android', '--android-cpu=%s' % android_cpu,
- '--runtime-mode=jit_release')
+ RunGN(
+ api, '--android', '--android-cpu=%s' % android_cpu,
+ '--runtime-mode=jit_release'
+ )
Build(api, out_dir)
if run_tests:
RunTests(api, out_dir, android_out_dir=out_dir, types='java')
@@ -442,7 +458,8 @@
api,
'android_debug_unopt',
android_out_dir='android_debug_unopt',
- types='java')
+ types='java'
+ )
for android_cpu, out_dir, artifact_dir, run_tests, abi in debug_variants:
RunGN(api, '--android', '--android-cpu=%s' % android_cpu, '--no-lto')
Build(api, out_dir)
@@ -455,21 +472,26 @@
UploadArtifacts(
api,
artifact_dir, ['out/%s/libflutter.so' % out_dir],
- archive_name='symbols.zip')
+ archive_name='symbols.zip'
+ )
# Upload the Maven artifacts.
engine_filename = '%s_debug' % abi
- UploadMavenArtifacts(api, [
- 'out/%s/%s.jar' % (out_dir, engine_filename),
- 'out/%s/%s.pom' % (out_dir, engine_filename),
- ], swarming_task_id)
+ UploadMavenArtifacts(
+ api, [
+ 'out/%s/%s.jar' % (out_dir, engine_filename),
+ 'out/%s/%s.pom' % (out_dir, engine_filename),
+ ], swarming_task_id
+ )
# Upload the embedding
- UploadMavenArtifacts(api, [
- 'out/android_debug/flutter_embedding_debug.jar',
- 'out/android_debug/flutter_embedding_debug.pom',
- 'out/android_debug/flutter_embedding_debug-sources.jar',
- ], swarming_task_id)
+ UploadMavenArtifacts(
+ api, [
+ 'out/android_debug/flutter_embedding_debug.jar',
+ 'out/android_debug/flutter_embedding_debug.pom',
+ 'out/android_debug/flutter_embedding_debug-sources.jar',
+ ], swarming_task_id
+ )
Build(api, 'android_debug', ':dist')
UploadSkyEngineDartPackage(api)
@@ -488,12 +510,18 @@
# Do arm64 first because we have more tests for that one, and can bail out
# earlier if they fail.
aot_variants = [
- ('arm64', 'android_%s_arm64', 'android-arm64-%s', 'clang_x64',
- 'aarch64-linux-android', 'arm64_v8a'),
- ('arm', 'android_%s', 'android-arm-%s', 'clang_x64',
- 'arm-linux-androideabi', 'armeabi_v7a'),
- ('x64', 'android_%s_x64', 'android-x64-%s', 'clang_x64',
- 'x86_64-linux-android', 'x86_64'),
+ (
+ 'arm64', 'android_%s_arm64', 'android-arm64-%s', 'clang_x64',
+ 'aarch64-linux-android', 'arm64_v8a'
+ ),
+ (
+ 'arm', 'android_%s', 'android-arm-%s', 'clang_x64',
+ 'arm-linux-androideabi', 'armeabi_v7a'
+ ),
+ (
+ 'x64', 'android_%s_x64', 'android-x64-%s', 'clang_x64',
+ 'x86_64-linux-android', 'x86_64'
+ ),
]
for (android_cpu, out_dir, artifact_dir, clang_dir, android_triple,
abi) in aot_variants:
@@ -501,8 +529,10 @@
build_output_dir = out_dir % runtime_mode
upload_dir = artifact_dir % runtime_mode
- RunGN(api, '--android', '--runtime-mode=' + runtime_mode,
- '--android-cpu=%s' % android_cpu)
+ RunGN(
+ api, '--android', '--runtime-mode=' + runtime_mode,
+ '--android-cpu=%s' % android_cpu
+ )
Build(api, build_output_dir)
Build(api, build_output_dir, "%s/gen_snapshot" % clang_dir)
@@ -519,8 +549,10 @@
api.step('Build scenario app', compile_cmd)
firebase_cmd = [
'./flutter/ci/firebase_testlab.sh',
- scenario_app_dir.join('android', 'app', 'build', 'outputs',
- 'apk', 'debug', 'app-debug.apk'),
+ scenario_app_dir.join(
+ 'android', 'app', 'build', 'outputs', 'apk', 'debug',
+ 'app-debug.apk'
+ ),
api.buildbucket.gitiles_commit.id or 'testing',
swarming_task_id,
]
@@ -528,15 +560,19 @@
# TODO(egarciad): Don't upload flutter.jar once the migration to Maven
# is completed.
- UploadArtifacts(api, upload_dir, [
- 'out/%s/flutter.jar' % build_output_dir,
- ])
+ UploadArtifacts(
+ api, upload_dir, [
+ 'out/%s/flutter.jar' % build_output_dir,
+ ]
+ )
# Upload the Maven artifacts.
- UploadMavenArtifacts(api, [
- 'out/%s/%s_%s.jar' % (build_output_dir, abi, runtime_mode),
- 'out/%s/%s_%s.pom' % (build_output_dir, abi, runtime_mode),
- ], swarming_task_id)
+ UploadMavenArtifacts(
+ api, [
+ 'out/%s/%s_%s.jar' % (build_output_dir, abi, runtime_mode),
+ 'out/%s/%s_%s.pom' % (build_output_dir, abi, runtime_mode),
+ ], swarming_task_id
+ )
# Upload artifacts used for AOT compilation on Linux hosts.
UploadArtifacts(
@@ -544,26 +580,33 @@
upload_dir, [
'out/%s/%s/gen_snapshot' % (build_output_dir, clang_dir),
],
- archive_name='linux-x64.zip')
+ archive_name='linux-x64.zip'
+ )
unstripped_lib_flutter_path = 'out/%s/libflutter.so' % build_output_dir
UploadArtifacts(
api,
upload_dir, [unstripped_lib_flutter_path],
- archive_name='symbols.zip')
+ archive_name='symbols.zip'
+ )
if runtime_mode == 'release' and android_cpu != 'x64':
- UploadTreeMap(api, upload_dir, unstripped_lib_flutter_path,
- android_triple)
+ UploadTreeMap(
+ api, upload_dir, unstripped_lib_flutter_path, android_triple
+ )
# Upload the embedding
for runtime_mode in ['profile', 'release']:
build_output_dir = out_dir % runtime_mode
- UploadMavenArtifacts(api, [
- 'out/%s/flutter_embedding_%s.jar' % (build_output_dir, runtime_mode),
- 'out/%s/flutter_embedding_%s.pom' % (build_output_dir, runtime_mode),
- 'out/%s/flutter_embedding_%s-sources.jar' %
- (build_output_dir, runtime_mode),
- ], swarming_task_id)
+ UploadMavenArtifacts(
+ api, [
+ 'out/%s/flutter_embedding_%s.jar' %
+ (build_output_dir, runtime_mode),
+ 'out/%s/flutter_embedding_%s.pom' %
+ (build_output_dir, runtime_mode),
+ 'out/%s/flutter_embedding_%s-sources.jar' %
+ (build_output_dir, runtime_mode),
+ ], swarming_task_id
+ )
def PackageLinuxDesktopVariant(api, label, bucket_name):
@@ -579,7 +622,8 @@
'flutter_linux',
'linux-x64-flutter-gtk.zip',
platform=bucket_name,
- file_paths=artifacts)
+ file_paths=artifacts
+ )
def BuildLinux(api):
@@ -594,20 +638,23 @@
RunTests(api, 'host_profile', types='engine')
Build(api, 'host_release')
RunTests(api, 'host_release', types='dart,engine,benchmarks')
- UploadArtifacts(api, 'linux-x64', [
- ICU_DATA_PATH,
- 'out/host_debug/flutter_tester',
- 'out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin',
- 'out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin',
- 'out/host_debug_unopt/gen/frontend_server.dart.snapshot',
- ])
+ UploadArtifacts(
+ api, 'linux-x64', [
+ ICU_DATA_PATH,
+ 'out/host_debug/flutter_tester',
+ 'out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin',
+ 'out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin',
+ 'out/host_debug_unopt/gen/frontend_server.dart.snapshot',
+ ]
+ )
UploadArtifacts(
api,
'linux-x64', [
'out/host_debug/flutter_embedder.h',
'out/host_debug/libflutter_engine.so',
],
- archive_name='linux-x64-embedder')
+ archive_name='linux-x64-embedder'
+ )
# Desktop embedding.
PackageLinuxDesktopVariant(api, 'host_debug', 'linux-x64-debug')
@@ -623,7 +670,8 @@
'out/host_release/font-subset',
'out/host_debug/gen/const_finder.dart.snapshot',
],
- archive_name='font-subset.zip')
+ archive_name='font-subset.zip'
+ )
UploadFlutterPatchedSdk(api)
UploadDartSdk(api, archive_name='dart-sdk-linux-x64.zip')
@@ -632,25 +680,31 @@
def GetFuchsiaBuildId(api):
checkout = GetCheckoutPath(api)
- manifest_path = checkout.join('fuchsia', 'sdk', 'linux', 'meta',
- 'manifest.json')
+ manifest_path = checkout.join(
+ 'fuchsia', 'sdk', 'linux', 'meta', 'manifest.json'
+ )
manifest_data = api.file.read_json(
- 'Read manifest', manifest_path, test_data={'id': 123})
+ 'Read manifest', manifest_path, test_data={'id': 123}
+ )
return manifest_data['id']
-def DownloadFuchsiaSystemDeps(api, target_dir, bucket_name, build_id,
- image_name, packages_name):
- api.gsutil.download(bucket_name,
- 'development/%s/images/%s' % (build_id, image_name),
- target_dir)
- api.gsutil.download(bucket_name,
- 'development/%s/packages/%s' % (build_id, packages_name),
- target_dir)
+def DownloadFuchsiaSystemDeps(
+ api, target_dir, bucket_name, build_id, image_name, packages_name
+):
+ api.gsutil.download(
+ bucket_name, 'development/%s/images/%s' % (build_id, image_name),
+ target_dir
+ )
+ api.gsutil.download(
+ bucket_name, 'development/%s/packages/%s' % (build_id, packages_name),
+ target_dir
+ )
-def IsolateFuchsiaTestArtifacts(api, checkout, fuchsia_tools, image_name,
- packages_name, fuchsia_test_script):
+def IsolateFuchsiaTestArtifacts(
+ api, checkout, fuchsia_tools, image_name, packages_name, fuchsia_test_script
+):
"""
Gets the system image for the current Fuchsia SDK from cloud storage, adds it
to an isolated along with the `pm` and `device-finder` utilities, as well as the
@@ -661,26 +715,36 @@
with api.os_utils.make_temp_directory('isolated') as isolated_dir:
with api.step.nest('Copy files'):
api.file.copy('Copy test script', fuchsia_test_script, isolated_dir)
- api.file.copy('Copy device-finder', fuchsia_tools.join('device-finder'),
- isolated_dir)
+ api.file.copy(
+ 'Copy device-finder', fuchsia_tools.join('device-finder'),
+ isolated_dir
+ )
api.file.copy('Copy pm', fuchsia_tools.join('pm'), isolated_dir)
api.file.copy(
'Copy flutter_runner far',
- checkout.join('out', 'fuchsia_bucket', 'flutter', 'x64', 'debug',
- 'aot', 'flutter_aot_runner-0.far'), isolated_dir)
- test_fars_file = checkout.join('flutter', 'testing', 'fuchsia',
- 'test_fars')
- test_fars_raw = api.file.read_text('Retrieve list of test FARs',
- test_fars_file)
+ checkout.join(
+ 'out', 'fuchsia_bucket', 'flutter', 'x64', 'debug', 'aot',
+ 'flutter_aot_runner-0.far'
+ ), isolated_dir
+ )
+ test_fars_file = checkout.join(
+ 'flutter', 'testing', 'fuchsia', 'test_fars'
+ )
+ test_fars_raw = api.file.read_text(
+ 'Retrieve list of test FARs', test_fars_file
+ )
test_fars = test_fars_raw.split('\n')
for far in test_fars:
if (len(far) > 0) and (not far.startswith('#')):
- api.file.copy('Copy %s to isolated' % far,
- checkout.join('out', 'fuchsia_debug_x64', far),
- isolated_dir)
+ api.file.copy(
+ 'Copy %s to isolated' % far,
+ checkout.join('out', 'fuchsia_debug_x64', far), isolated_dir
+ )
- DownloadFuchsiaSystemDeps(api, isolated_dir, 'fuchsia',
- GetFuchsiaBuildId(api), image_name, packages_name)
+ DownloadFuchsiaSystemDeps(
+ api, isolated_dir, 'fuchsia', GetFuchsiaBuildId(api), image_name,
+ packages_name
+ )
isolated = api.isolated.isolated(isolated_dir)
isolated.add_dir(isolated_dir)
return isolated.archive('Archive Fuchsia Test Isolate')
@@ -700,30 +764,37 @@
image_name = 'generic-x64.tgz'
packages_name = 'generic-x64.tar.gz'
- fuchsia_test_script = checkout.join('flutter', 'testing', 'fuchsia',
- 'run_tests.sh')
+ fuchsia_test_script = checkout.join(
+ 'flutter', 'testing', 'fuchsia', 'run_tests.sh'
+ )
- isolated_hash = IsolateFuchsiaTestArtifacts(api, checkout, fuchsia_tools,
- image_name, packages_name,
- fuchsia_test_script)
+ isolated_hash = IsolateFuchsiaTestArtifacts(
+ api, checkout, fuchsia_tools, image_name, packages_name,
+ fuchsia_test_script
+ )
ensure_file = api.cipd.EnsureFile()
- ensure_file.add_package('flutter/fuchsia_ctl/${platform}',
- api.properties.get('fuchsia_ctl_version'))
+ ensure_file.add_package(
+ 'flutter/fuchsia_ctl/${platform}',
+ api.properties.get('fuchsia_ctl_version')
+ )
request = (
- api.swarming.task_request().with_name(
- 'flutter_fuchsia_unittests').with_priority(100))
+ api.swarming.task_request().with_name('flutter_fuchsia_unittests'
+ ).with_priority(100)
+ )
request = (
request.with_slice(
- 0, request[0].with_cipd_ensure_file(ensure_file).with_command(
- ['./run_tests.sh', image_name, packages_name]).with_dimensions(
- pool='luci.flutter.tests',
- device_type='Intel NUC Kit NUC7i5DNHE').with_isolated(
- isolated_hash).with_expiration_secs(3600)
- .with_io_timeout_secs(3600).with_execution_timeout_secs(
- 3600).with_idempotent(True).with_containment_type('AUTO')))
+ 0, request[0].with_cipd_ensure_file(ensure_file).with_command([
+ './run_tests.sh', image_name, packages_name
+ ]).with_dimensions(
+ pool='luci.flutter.tests', device_type='Intel NUC Kit NUC7i5DNHE'
+ ).with_isolated(isolated_hash).with_expiration_secs(3600)
+ .with_io_timeout_secs(3600).with_execution_timeout_secs(3600)
+ .with_idempotent(True).with_containment_type('AUTO')
+ )
+ )
# Trigger the task request.
metadata = api.swarming.trigger('Trigger Fuchsia Tests', requests=[request])
@@ -731,12 +802,14 @@
fuchsia_output = api.path['cleanup'].join('fuchsia_test_output')
api.file.ensure_directory('swarming output', fuchsia_output)
results = api.swarming.collect(
- 'collect', metadata, output_dir=fuchsia_output, timeout='30m')
+ 'collect', metadata, output_dir=fuchsia_output, timeout='30m'
+ )
api.display_util.display_tasks(
'Display builds',
results=results,
metadata=metadata,
- raise_on_failure=True)
+ raise_on_failure=True
+ )
def GetRemoteFileName(exec_path):
@@ -765,7 +838,8 @@
'list %s' % symbol_dir,
symbol_dir,
recursive=True,
- test_data=['test_dir/sub_dir/test_file.debug'])
+ test_data=['test_dir/sub_dir/test_file.debug']
+ )
# TODO(kaushikiska): Upload all the binaries as one gsutil copy
# rather than doing it file by file.
for executable in executables:
@@ -788,7 +862,8 @@
def UploadFuchsiaDebugSymbols(api):
checkout = GetCheckoutPath(api)
dbg_symbols_script = str(
- checkout.join('flutter/tools/fuchsia/merge_and_upload_debug_symbols.py'))
+ checkout.join('flutter/tools/fuchsia/merge_and_upload_debug_symbols.py')
+ )
git_rev = api.buildbucket.gitiles_commit.id or 'HEAD'
archs = ['arm64', 'x64']
@@ -855,7 +930,8 @@
checkout = GetCheckoutPath(api)
build_script = str(
- checkout.join('flutter/tools/fuchsia/build_fuchsia_artifacts.py'))
+ checkout.join('flutter/tools/fuchsia/build_fuchsia_artifacts.py')
+ )
git_rev = api.buildbucket.gitiles_commit.id or 'HEAD'
try:
@@ -874,10 +950,11 @@
api.isolated.download(
'Download for build %s' % build_id,
builds[build_id].output.properties['isolated_output_hash'],
- GetCheckoutPath(api))
+ GetCheckoutPath(api)
+ )
- if (api.bucket_util.should_upload_packages()
- and not api.runtime.is_experimental):
+ if (api.bucket_util.should_upload_packages() and
+ not api.runtime.is_experimental):
fuchsia_package_cmd = [
'python',
build_script,
@@ -932,39 +1009,54 @@
host_profile_path = GetCheckoutPath(api).join('out', 'host_profile')
host_release_path = GetCheckoutPath(api).join('out', 'host_release')
- api.zip.directory('Archive FlutterEmbedder.framework',
- host_debug_path.join('FlutterEmbedder.framework'),
- host_debug_path.join('FlutterEmbedder.framework.zip'))
+ api.zip.directory(
+ 'Archive FlutterEmbedder.framework',
+ host_debug_path.join('FlutterEmbedder.framework'),
+ host_debug_path.join('FlutterEmbedder.framework.zip')
+ )
- api.zip.directory('Archive FlutterMacOS.framework',
- host_debug_path.join('FlutterMacOS.framework'),
- host_debug_path.join('FlutterMacOS.framework.zip'))
- api.zip.directory('Archive FlutterMacOS.framework profile',
- host_profile_path.join('FlutterMacOS.framework'),
- host_profile_path.join('FlutterMacOS.framework.zip'))
- api.zip.directory('Archive FlutterMacOS.framework release',
- host_release_path.join('FlutterMacOS.framework'),
- host_release_path.join('FlutterMacOS.framework.zip'))
+ api.zip.directory(
+ 'Archive FlutterMacOS.framework',
+ host_debug_path.join('FlutterMacOS.framework'),
+ host_debug_path.join('FlutterMacOS.framework.zip')
+ )
+ api.zip.directory(
+ 'Archive FlutterMacOS.framework profile',
+ host_profile_path.join('FlutterMacOS.framework'),
+ host_profile_path.join('FlutterMacOS.framework.zip')
+ )
+ api.zip.directory(
+ 'Archive FlutterMacOS.framework release',
+ host_release_path.join('FlutterMacOS.framework'),
+ host_release_path.join('FlutterMacOS.framework.zip')
+ )
- UploadArtifacts(api, 'darwin-x64', [
- ICU_DATA_PATH,
- 'out/host_debug/flutter_tester',
- 'out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin',
- 'out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin',
- 'out/host_debug_unopt/gen/frontend_server.dart.snapshot',
- 'out/host_debug_unopt/gen_snapshot',
- ])
- UploadArtifacts(api, 'darwin-x64-profile', [
- 'out/host_profile/gen_snapshot',
- ])
- UploadArtifacts(api, 'darwin-x64-release', [
- 'out/host_release/gen_snapshot',
- ])
+ UploadArtifacts(
+ api, 'darwin-x64', [
+ ICU_DATA_PATH,
+ 'out/host_debug/flutter_tester',
+ 'out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin',
+ 'out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin',
+ 'out/host_debug_unopt/gen/frontend_server.dart.snapshot',
+ 'out/host_debug_unopt/gen_snapshot',
+ ]
+ )
+ UploadArtifacts(
+ api, 'darwin-x64-profile', [
+ 'out/host_profile/gen_snapshot',
+ ]
+ )
+ UploadArtifacts(
+ api, 'darwin-x64-release', [
+ 'out/host_release/gen_snapshot',
+ ]
+ )
UploadArtifacts(
api,
'darwin-x64', ['out/host_debug/FlutterEmbedder.framework.zip'],
- archive_name='FlutterEmbedder.framework.zip')
+ archive_name='FlutterEmbedder.framework.zip'
+ )
flutter_podspec = \
'flutter/shell/platform/darwin/macos/framework/FlutterMacOS.podspec'
@@ -974,21 +1066,24 @@
'out/host_debug/FlutterMacOS.framework.zip',
flutter_podspec,
],
- archive_name='FlutterMacOS.framework.zip')
+ archive_name='FlutterMacOS.framework.zip'
+ )
UploadArtifacts(
api,
'darwin-x64-profile', [
'out/host_profile/FlutterMacOS.framework.zip',
flutter_podspec,
],
- archive_name='FlutterMacOS.framework.zip')
+ archive_name='FlutterMacOS.framework.zip'
+ )
UploadArtifacts(
api,
'darwin-x64-release', [
'out/host_release/FlutterMacOS.framework.zip',
flutter_podspec,
],
- archive_name='FlutterMacOS.framework.zip')
+ archive_name='FlutterMacOS.framework.zip'
+ )
if BuildFontSubset(api):
UploadArtifacts(
api,
@@ -996,7 +1091,8 @@
'out/host_release/font-subset',
'out/host_debug/gen/const_finder.dart.snapshot',
],
- archive_name='font-subset.zip')
+ archive_name='font-subset.zip'
+ )
# Legacy; remove once Flutter tooling is updated to use the -debug location.
UploadArtifacts(
api,
@@ -1004,7 +1100,8 @@
'out/host_debug/FlutterMacOS.framework.zip',
flutter_podspec,
],
- archive_name='FlutterMacOS.framework.zip')
+ archive_name='FlutterMacOS.framework.zip'
+ )
UploadDartSdk(api, archive_name='dart-sdk-darwin-x64.zip')
UploadWebSdk(api, archive_name='flutter-web-sdk-darwin-x64.zip')
@@ -1033,46 +1130,54 @@
"android-arm-profile", [
'out/android_profile/clang_x64/gen_snapshot',
],
- archive_name='darwin-x64.zip')
+ archive_name='darwin-x64.zip'
+ )
UploadArtifacts(
api,
"android-arm64-profile", [
'out/android_profile_arm64/clang_x64/gen_snapshot',
],
- archive_name='darwin-x64.zip')
+ archive_name='darwin-x64.zip'
+ )
UploadArtifacts(
api,
"android-x64-profile", [
'out/android_profile_x64/clang_x64/gen_snapshot',
],
- archive_name='darwin-x64.zip')
+ archive_name='darwin-x64.zip'
+ )
UploadArtifacts(
api,
"android-arm-release", [
'out/android_release/clang_x64/gen_snapshot',
],
- archive_name='darwin-x64.zip')
+ archive_name='darwin-x64.zip'
+ )
UploadArtifacts(
api,
"android-arm64-release", [
'out/android_release_arm64/clang_x64/gen_snapshot',
],
- archive_name='darwin-x64.zip')
+ archive_name='darwin-x64.zip'
+ )
UploadArtifacts(
api,
"android-x64-release", [
'out/android_release_x64/clang_x64/gen_snapshot',
],
- archive_name='darwin-x64.zip')
+ archive_name='darwin-x64.zip'
+ )
-def PackageIOSVariant(api,
- label,
- arm64_out,
- armv7_out,
- sim_out,
- bucket_name,
- strip_bitcode=False):
+def PackageIOSVariant(
+ api,
+ label,
+ arm64_out,
+ armv7_out,
+ sim_out,
+ bucket_name,
+ strip_bitcode=False
+):
checkout = GetCheckoutPath(api)
out_dir = checkout.join('out')
@@ -1099,13 +1204,16 @@
"--strip",
])
with api.context(cwd=checkout):
- api.step('Create iOS %s Flutter.framework' % label,
- create_ios_framework_cmd)
+ api.step(
+ 'Create iOS %s Flutter.framework' % label, create_ios_framework_cmd
+ )
# Zip Flutter.framework.
- api.zip.directory('Archive Flutter.framework for %s' % label,
- label_dir.join('Flutter.framework'),
- label_dir.join('Flutter.framework.zip'))
+ api.zip.directory(
+ 'Archive Flutter.framework for %s' % label,
+ label_dir.join('Flutter.framework'),
+ label_dir.join('Flutter.framework.zip')
+ )
# Package the multi-arch gen_snapshot for macOS.
create_macos_gen_snapshot_cmd = [
@@ -1119,8 +1227,9 @@
]
with api.context(cwd=checkout):
- api.step('Create macOS %s gen_snapshot' % label,
- create_macos_gen_snapshot_cmd)
+ api.step(
+ 'Create macOS %s gen_snapshot' % label, create_macos_gen_snapshot_cmd
+ )
# Upload the artifacts to cloud storage.
artifacts = [
@@ -1147,8 +1256,10 @@
scenario_app_tests = test_dir.join('scenario_app')
with api.context(cwd=scenario_app_tests):
- api.step('Scenario App Integration Tests',
- ['./build_and_run_ios_tests.sh', 'ios_debug_sim'])
+ api.step(
+ 'Scenario App Integration Tests',
+ ['./build_and_run_ios_tests.sh', 'ios_debug_sim']
+ )
def BuildIOS(api):
@@ -1174,31 +1285,38 @@
BuildObjcDoc(api)
- PackageIOSVariant(api, 'debug', 'ios_debug', 'ios_debug_arm',
- 'ios_debug_sim', 'ios')
+ PackageIOSVariant(
+ api, 'debug', 'ios_debug', 'ios_debug_arm', 'ios_debug_sim', 'ios'
+ )
if api.properties.get('ios_profile', True):
RunGNBitcode(api, '--ios', '--runtime-mode', 'profile')
RunGNBitcode(api, '--ios', '--runtime-mode', 'profile', '--ios-cpu=arm')
BuildBitcode(api, 'ios_profile')
BuildBitcode(api, 'ios_profile_arm')
- PackageIOSVariant(api, 'profile', 'ios_profile', 'ios_profile_arm',
- 'ios_debug_sim', 'ios-profile')
+ PackageIOSVariant(
+ api, 'profile', 'ios_profile', 'ios_profile_arm', 'ios_debug_sim',
+ 'ios-profile'
+ )
if api.properties.get('ios_release', True):
RunGNBitcode(api, '--ios', '--runtime-mode', 'release')
RunGNBitcode(api, '--ios', '--runtime-mode', 'release', '--ios-cpu=arm')
BuildBitcode(api, 'ios_release')
BuildBitcode(api, 'ios_release_arm')
- PackageIOSVariant(api, 'release', 'ios_release', 'ios_release_arm',
- 'ios_debug_sim', 'ios-release')
+ PackageIOSVariant(
+ api, 'release', 'ios_release', 'ios_release_arm', 'ios_debug_sim',
+ 'ios-release'
+ )
if not api.properties.get('no_bitcode', False):
# Create a bitcode-stripped version. This will help customers who do not
# need bitcode, which significantly increases download size. This should
# be removed when bitcode is enabled by default in Flutter.
- PackageIOSVariant(api, 'release', 'ios_release', 'ios_release_arm',
- 'ios_debug_sim', 'ios-release-nobitcode', True)
+ PackageIOSVariant(
+ api, 'release', 'ios_release', 'ios_release_arm', 'ios_debug_sim',
+ 'ios-release-nobitcode', True
+ )
def PackageWindowsDesktopVariant(api, label, bucket_name):
@@ -1215,7 +1333,8 @@
if bucket_name.endswith('profile') or bucket_name.endswith('release'):
artifacts.append('out/%s/gen_snapshot.exe' % label)
UploadArtifacts(
- api, bucket_name, artifacts, archive_name='windows-x64-flutter.zip')
+ api, bucket_name, artifacts, archive_name='windows-x64-flutter.zip'
+ )
def BuildWindows(api):
@@ -1233,13 +1352,15 @@
if BuildFontSubset(api):
Build(api, 'host_release', 'font-subset')
- UploadArtifacts(api, 'windows-x64', [
- ICU_DATA_PATH,
- 'out/host_debug/flutter_tester.exe',
- 'out/host_debug/gen/flutter/lib/snapshot/isolate_snapshot.bin',
- 'out/host_debug/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin',
- 'out/host_debug/gen/frontend_server.dart.snapshot',
- ])
+ UploadArtifacts(
+ api, 'windows-x64', [
+ ICU_DATA_PATH,
+ 'out/host_debug/flutter_tester.exe',
+ 'out/host_debug/gen/flutter/lib/snapshot/isolate_snapshot.bin',
+ 'out/host_debug/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin',
+ 'out/host_debug/gen/frontend_server.dart.snapshot',
+ ]
+ )
UploadArtifacts(
api,
@@ -1250,7 +1371,8 @@
'out/host_debug/flutter_engine.dll.lib',
'out/host_debug/flutter_engine.dll.pdb',
],
- archive_name='windows-x64-embedder.zip')
+ archive_name='windows-x64-embedder.zip'
+ )
PackageWindowsDesktopVariant(api, 'host_debug', 'windows-x64-debug')
PackageWindowsDesktopVariant(api, 'host_profile', 'windows-x64-profile')
@@ -1260,7 +1382,8 @@
'src/out/host_debug',
'cpp_client_wrapper',
'flutter-cpp-client-wrapper.zip',
- platform='windows-x64')
+ platform='windows-x64'
+ )
# Legacy; remove once Flutter tooling is updated to use the -debug location.
PackageWindowsDesktopVariant(api, 'host_debug', 'windows-x64')
@@ -1271,7 +1394,8 @@
'out/host_release/font-subset.exe',
'out/host_debug/gen/const_finder.dart.snapshot',
],
- archive_name='font-subset.zip')
+ archive_name='font-subset.zip'
+ )
UploadDartSdk(api, archive_name='dart-sdk-windows-x64.zip')
UploadWebSdk(api, archive_name='flutter-web-sdk-windows-x64.zip')
@@ -1294,35 +1418,41 @@
"android-arm-profile", [
'out/android_profile/gen_snapshot.exe',
],
- archive_name='windows-x64.zip')
+ archive_name='windows-x64.zip'
+ )
UploadArtifacts(
api,
"android-arm64-profile", [
'out/android_profile_arm64/gen_snapshot.exe',
],
- archive_name='windows-x64.zip')
+ archive_name='windows-x64.zip'
+ )
UploadArtifacts(
api,
"android-x64-profile", [
'out/android_profile_x64/gen_snapshot.exe',
],
- archive_name='windows-x64.zip')
+ archive_name='windows-x64.zip'
+ )
UploadArtifacts(
api,
"android-arm-release", [
'out/android_release/gen_snapshot.exe',
],
- archive_name='windows-x64.zip')
+ archive_name='windows-x64.zip'
+ )
UploadArtifacts(
api,
"android-arm64-release", [
'out/android_release_arm64/gen_snapshot.exe',
],
- archive_name='windows-x64.zip')
+ archive_name='windows-x64.zip'
+ )
UploadArtifacts(
api,
"android-x64-release", ['out/android_release_x64/gen_snapshot.exe'],
- archive_name='windows-x64.zip')
+ archive_name='windows-x64.zip'
+ )
def BuildJavadoc(api):
@@ -1333,12 +1463,14 @@
]
with api.context(cwd=checkout):
api.step('build javadoc', javadoc_cmd)
- api.zip.directory('archive javadoc', temp_dir,
- checkout.join('out/android_javadoc.zip'))
+ api.zip.directory(
+ 'archive javadoc', temp_dir, checkout.join('out/android_javadoc.zip')
+ )
if api.bucket_util.should_upload_packages():
api.bucket_util.safe_upload(
checkout.join('out/android_javadoc.zip'),
- GetCloudPath(api, 'android-javadoc.zip'))
+ GetCloudPath(api, 'android-javadoc.zip')
+ )
# The MacOSX10.15 SDK included in Xcode 11 does not ship Ruby 2.3 headers,
@@ -1357,7 +1489,9 @@
xcode_binary_cache_dir,
api.cipd.EnsureFile().add_package(
'infra_internal/ios/xcode/xcode_binaries/${platform}',
- 'yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC'))
+ 'yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC'
+ )
+ )
# Override SDKROOT during gem installation.
sdk_relative_path = 'Contents/Developer/Platforms/' \
@@ -1374,12 +1508,14 @@
with SetupMacOSSDK(api):
with api.context(cwd=gem_dir):
- api.step('install jazzy', [
- 'gem', 'install', 'jazzy:' + api.properties['jazzy_version'],
- '--install-dir', '.'
- ])
- with api.context(
- env={"GEM_HOME": gem_dir}, env_prefixes={'PATH': [gem_dir.join('bin')]}):
+ api.step(
+ 'install jazzy', [
+ 'gem', 'install', 'jazzy:' + api.properties['jazzy_version'],
+ '--install-dir', '.'
+ ]
+ )
+ with api.context(env={"GEM_HOME": gem_dir},
+ env_prefixes={'PATH': [gem_dir.join('bin')]}):
yield
@@ -1390,12 +1526,15 @@
objcdoc_cmd = [checkout.join('flutter/tools/gen_objcdoc.sh'), temp_dir]
with api.context(cwd=checkout.join('flutter')):
api.step('build obj-c doc', objcdoc_cmd)
- api.zip.directory('archive obj-c doc', temp_dir,
- checkout.join('out/ios-objcdoc.zip'))
+ api.zip.directory(
+ 'archive obj-c doc', temp_dir, checkout.join('out/ios-objcdoc.zip')
+ )
if api.bucket_util.should_upload_packages():
- api.bucket_util.safe_upload(checkout.join('out/ios-objcdoc.zip'),
- GetCloudPath(api, 'ios-objcdoc.zip'))
+ api.bucket_util.safe_upload(
+ checkout.join('out/ios-objcdoc.zip'),
+ GetCloudPath(api, 'ios-objcdoc.zip')
+ )
def RunSteps(api, properties, env_properties):
@@ -1406,8 +1545,9 @@
api.file.ensure_directory('Ensure checkout cache', cache_root)
api.goma.ensure()
- dart_bin = checkout.join('third_party', 'dart', 'tools', 'sdks', 'dart-sdk',
- 'bin')
+ dart_bin = checkout.join(
+ 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin'
+ )
android_home = checkout.join('third_party', 'android_tools', 'sdk')
@@ -1433,20 +1573,24 @@
# upstream remote
api.step(
'Fetch dart tags',
- ['git', 'fetch', 'https://dart.googlesource.com/sdk.git', '--tags'])
+ ['git', 'fetch', 'https://dart.googlesource.com/sdk.git', '--tags']
+ )
api.step('List all tags', ['git', 'tag', '--list'])
api.gclient.runhooks()
with api.step.nest('Android SDK Licenses'):
api.file.ensure_directory('mkdir licenses', android_home.join('licenses'))
- api.file.write_text('android sdk license',
- android_home.join('licenses', 'android-sdk-license'),
- str(properties.android_sdk_license))
+ api.file.write_text(
+ 'android sdk license',
+ android_home.join('licenses', 'android-sdk-license'),
+ str(properties.android_sdk_license)
+ )
api.file.write_text(
'android sdk preview license',
android_home.join('licenses', 'android-sdk-preview-license'),
- str(properties.android_sdk_preview_license))
+ str(properties.android_sdk_preview_license)
+ )
if api.platform.is_linux:
if api.properties.get('build_host', True):
@@ -1482,7 +1626,8 @@
output_props = struct_pb2.Struct()
output_props['isolated_output_hash'] = 'deadbeef'
build = api.buildbucket.try_build_message(
- builder='Linux Drone', project='flutter')
+ builder='Linux Drone', project='flutter'
+ )
build.output.CopyFrom(build_pb2.Build.Output(properties=output_props))
collect_build_output = api.buildbucket.simulated_collect_output([build])
@@ -1492,10 +1637,12 @@
for should_publish_cipd in (True, False):
for no_lto in (True, False):
test = api.test(
- '%s%s%s%s%s' % (platform, '_upload' if should_upload else '',
- '_maven_or_bitcode' if maven_or_bitcode else '',
- '_publish_cipd' if should_publish_cipd else '',
- '_no_lto' if no_lto else ''),
+ '%s%s%s%s%s' % (
+ platform, '_upload' if should_upload else '',
+ '_maven_or_bitcode' if maven_or_bitcode else '',
+ '_publish_cipd' if should_publish_cipd else '',
+ '_no_lto' if no_lto else ''
+ ),
api.platform(platform, 64),
api.buildbucket.ci_build(
builder='%s Engine' % platform.capitalize(),
@@ -1521,9 +1668,11 @@
android_sdk_preview_license='android_sdk_preview_hash',
force_upload=True,
no_lto=no_lto,
- ),),
+ ),
+ ),
api.properties.environ(
- EnvProperties(SWARMING_TASK_ID='deadbeef')),
+ EnvProperties(SWARMING_TASK_ID='deadbeef')
+ ),
)
if platform == 'linux' and should_upload:
instances = 0 if should_publish_cipd else 1
@@ -1532,7 +1681,10 @@
'cipd search flutter/fuchsia git_revision:%s' %
git_revision,
api.cipd.example_search(
- 'flutter/fuchsia', instances=instances)))
+ 'flutter/fuchsia', instances=instances
+ )
+ )
+ )
if platform != 'win':
test += collect_build_output
if platform == 'mac':
@@ -1541,7 +1693,10 @@
InputProperties(
jazzy_version='0.8.4',
build_ios=True,
- no_bitcode=maven_or_bitcode)))
+ no_bitcode=maven_or_bitcode
+ )
+ )
+ )
yield test
yield api.test(
@@ -1555,7 +1710,8 @@
api.properties(InputProperties(
goma_jobs='1024',
upload_packages=True,
- )))
+ ))
+ )
for should_upload in (True, False):
yield api.test(
@@ -1574,14 +1730,16 @@
android_sdk_license='android_sdk_hash',
android_sdk_preview_license='android_sdk_preview_hash',
upload_packages=should_upload,
- )),
+ )
+ ),
)
yield api.test(
'clobber',
api.buildbucket.ci_build(
builder='Linux Host Engine',
git_repo='https://github.com/flutter/engine',
- project='flutter'),
+ project='flutter'
+ ),
collect_build_output,
api.runtime(is_luci=True, is_experimental=True),
api.step_data(
@@ -1602,14 +1760,17 @@
build_android_debug=True,
build_android_vulkan=True,
android_sdk_license='android_sdk_hash',
- android_sdk_preview_license='android_sdk_preview_hash')),
+ android_sdk_preview_license='android_sdk_preview_hash'
+ )
+ ),
)
yield api.test(
'pull_request',
api.buildbucket.ci_build(
builder='Linux Host Engine',
git_repo='https://github.com/flutter/engine',
- project='flutter'),
+ project='flutter'
+ ),
collect_build_output,
api.runtime(is_luci=True, is_experimental=True),
api.properties(
@@ -1626,7 +1787,9 @@
build_android_debug=True,
build_android_vulkan=True,
android_sdk_license='android_sdk_hash',
- android_sdk_preview_license='android_sdk_preview_hash')),
+ android_sdk_preview_license='android_sdk_preview_hash'
+ )
+ ),
)
test = api.test(
@@ -1640,7 +1803,8 @@
),
api.step_data(
'cipd search flutter/fuchsia git_revision:%s' % git_revision,
- api.cipd.example_search('flutter/fuchsia', instances=0)),
+ api.cipd.example_search('flutter/fuchsia', instances=0)
+ ),
collect_build_output,
api.properties(
InputProperties(
@@ -1658,7 +1822,9 @@
upload_packages=True,
android_sdk_license='android_sdk_hash',
android_sdk_preview_license='android_sdk_preview_hash',
- force_upload=False)),
+ force_upload=False
+ )
+ ),
api.properties.environ(EnvProperties(SWARMING_TASK_ID='deadbeef')),
)
# TODO(fujino): find out why these are not getting skipped based on properties
@@ -1707,17 +1873,20 @@
):
test += api.step_data(
'Ensure %s does not already exist on cloud storage' % artifact,
- retcode=1)
+ retcode=1
+ )
yield test
yield api.test(
'Linux Fuchsia failing test',
api.platform('linux', 64),
api.buildbucket.ci_build(
- builder='Linux Engine', git_repo=GIT_REPO, project='flutter'),
+ builder='Linux Engine', git_repo=GIT_REPO, project='flutter'
+ ),
api.step_data(
'gn --fuchsia --fuchsia-cpu x64 --runtime-mode debug --no-lto',
- retcode=1),
+ retcode=1
+ ),
api.properties(
InputProperties(
clobber=False,
@@ -1733,7 +1902,9 @@
upload_packages=True,
android_sdk_license='android_sdk_hash',
android_sdk_preview_license='android_sdk_preview_hash',
- force_upload=True)),
+ force_upload=True
+ )
+ ),
api.properties.environ(EnvProperties(SWARMING_TASK_ID='deadbeef')),
)
yield api.test(
@@ -1741,7 +1912,8 @@
api.buildbucket.ci_build(
builder='Linux Host Engine',
git_repo='https://github.com/flutter/engine',
- project='flutter'),
+ project='flutter'
+ ),
# Next line force a fail condition for the bot update
# first execution.
api.step_data("Checkout source code.bot_update", retcode=1),
@@ -1761,5 +1933,7 @@
build_android_debug=True,
build_android_vulkan=True,
android_sdk_license='android_sdk_hash',
- android_sdk_preview_license='android_sdk_preview_hash')),
+ android_sdk_preview_license='android_sdk_preview_hash'
+ )
+ ),
)
diff --git a/recipes/engine/scenarios.expected/with_failure_upload_0.json b/recipes/engine/scenarios.expected/with_failure_upload_0.json
index 5948835..cf3bd59 100644
--- a/recipes/engine/scenarios.expected/with_failure_upload_0.json
+++ b/recipes/engine/scenarios.expected/with_failure_upload_0.json
@@ -87,8 +87,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -149,6 +156,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine/scenarios.expected/with_failure_upload_1.json b/recipes/engine/scenarios.expected/with_failure_upload_1.json
index a87da6f..aec305d 100644
--- a/recipes/engine/scenarios.expected/with_failure_upload_1.json
+++ b/recipes/engine/scenarios.expected/with_failure_upload_1.json
@@ -87,8 +87,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -149,6 +156,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine/scenarios.expected/without_failure_upload_0.json b/recipes/engine/scenarios.expected/without_failure_upload_0.json
index 39c7447..4cc5324 100644
--- a/recipes/engine/scenarios.expected/without_failure_upload_0.json
+++ b/recipes/engine/scenarios.expected/without_failure_upload_0.json
@@ -87,8 +87,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -149,6 +156,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine/scenarios.expected/without_failure_upload_1.json b/recipes/engine/scenarios.expected/without_failure_upload_1.json
index 39c7447..4cc5324 100644
--- a/recipes/engine/scenarios.expected/without_failure_upload_1.json
+++ b/recipes/engine/scenarios.expected/without_failure_upload_1.json
@@ -87,8 +87,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -149,6 +156,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/Linux Fuchsia failing test.json b/recipes/engine_1_20_0.expected/Linux Fuchsia failing test.json
index ba0bc6c..70613a5 100644
--- a/recipes/engine_1_20_0.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine_1_20_0.expected/Linux Fuchsia failing test.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine_1_20_0.expected/Linux Fuchsia skips on duplicate.json
index 3ab9a5e..13577d2 100644
--- a/recipes/engine_1_20_0.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine_1_20_0.expected/Linux Fuchsia skips on duplicate.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/clobber.json b/recipes/engine_1_20_0.expected/clobber.json
index 8c23a07..d524ff1 100644
--- a/recipes/engine_1_20_0.expected/clobber.json
+++ b/recipes/engine_1_20_0.expected/clobber.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -185,6 +192,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/experimental.json b/recipes/engine_1_20_0.expected/experimental.json
index 0790baf..af27806 100644
--- a/recipes/engine_1_20_0.expected/experimental.json
+++ b/recipes/engine_1_20_0.expected/experimental.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/experimental_upload.json b/recipes/engine_1_20_0.expected/experimental_upload.json
index 7826461..526c560 100644
--- a/recipes/engine_1_20_0.expected/experimental_upload.json
+++ b/recipes/engine_1_20_0.expected/experimental_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/first_bot_update_failed.json b/recipes/engine_1_20_0.expected/first_bot_update_failed.json
index 9f94ebe..8147b79 100644
--- a/recipes/engine_1_20_0.expected/first_bot_update_failed.json
+++ b/recipes/engine_1_20_0.expected/first_bot_update_failed.json
@@ -126,8 +126,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,35 +190,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/vpython",
- "-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Checkout source code.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -220,6 +198,14 @@
"rmtree",
"[CACHE]/builder"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Clobber cache (2)",
"~followup_annotations": [
@@ -236,6 +222,14 @@
"rmtree",
"[CACHE]/git"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Clobber git cache",
"~followup_annotations": [
@@ -254,6 +248,14 @@
"0777",
"[CACHE]/builder"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Ensure checkout cache (2)",
"~followup_annotations": [
@@ -284,8 +286,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -346,6 +355,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/linux.json b/recipes/engine_1_20_0.expected/linux.json
index 329cd2d..864112c 100644
--- a/recipes/engine_1_20_0.expected/linux.json
+++ b/recipes/engine_1_20_0.expected/linux.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/linux_maven_or_bitcode.json b/recipes/engine_1_20_0.expected/linux_maven_or_bitcode.json
index 329cd2d..864112c 100644
--- a/recipes/engine_1_20_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_1_20_0.expected/linux_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_20_0.expected/linux_maven_or_bitcode_publish_cipd.json
index 329cd2d..864112c 100644
--- a/recipes/engine_1_20_0.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/linux_publish_cipd.json b/recipes/engine_1_20_0.expected/linux_publish_cipd.json
index 329cd2d..864112c 100644
--- a/recipes/engine_1_20_0.expected/linux_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/linux_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/linux_upload.json b/recipes/engine_1_20_0.expected/linux_upload.json
index cbc379f..0807c0a 100644
--- a/recipes/engine_1_20_0.expected/linux_upload.json
+++ b/recipes/engine_1_20_0.expected/linux_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_1_20_0.expected/linux_upload_maven_or_bitcode.json
index 6303999..13c0c8c 100644
--- a/recipes/engine_1_20_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_20_0.expected/linux_upload_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_20_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index 900483f..69ecb34 100644
--- a/recipes/engine_1_20_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/linux_upload_publish_cipd.json b/recipes/engine_1_20_0.expected/linux_upload_publish_cipd.json
index 911ee1d..308c23b 100644
--- a/recipes/engine_1_20_0.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/linux_upload_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/mac.json b/recipes/engine_1_20_0.expected/mac.json
index 4eb8d8f..b1b26f7 100644
--- a/recipes/engine_1_20_0.expected/mac.json
+++ b/recipes/engine_1_20_0.expected/mac.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_20_0.expected/mac_maven_or_bitcode.json
index 3a6ac05..c0c978e 100644
--- a/recipes/engine_1_20_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_20_0.expected/mac_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_20_0.expected/mac_maven_or_bitcode_publish_cipd.json
index 3a6ac05..c0c978e 100644
--- a/recipes/engine_1_20_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/mac_publish_cipd.json b/recipes/engine_1_20_0.expected/mac_publish_cipd.json
index 4eb8d8f..b1b26f7 100644
--- a/recipes/engine_1_20_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/mac_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/mac_upload.json b/recipes/engine_1_20_0.expected/mac_upload.json
index 7440efa..6644aa9 100644
--- a/recipes/engine_1_20_0.expected/mac_upload.json
+++ b/recipes/engine_1_20_0.expected/mac_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_20_0.expected/mac_upload_maven_or_bitcode.json
index 255b4d8..62a21ae 100644
--- a/recipes/engine_1_20_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_20_0.expected/mac_upload_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_20_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 255b4d8..62a21ae 100644
--- a/recipes/engine_1_20_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_20_0.expected/mac_upload_publish_cipd.json
index 7440efa..6644aa9 100644
--- a/recipes/engine_1_20_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/mac_upload_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/pull_request.json b/recipes/engine_1_20_0.expected/pull_request.json
index 6ca0311..aadfb8f 100644
--- a/recipes/engine_1_20_0.expected/pull_request.json
+++ b/recipes/engine_1_20_0.expected/pull_request.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -185,6 +192,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/safeupload_raise_on_duplicate.json b/recipes/engine_1_20_0.expected/safeupload_raise_on_duplicate.json
index 3459af9..cb91d32 100644
--- a/recipes/engine_1_20_0.expected/safeupload_raise_on_duplicate.json
+++ b/recipes/engine_1_20_0.expected/safeupload_raise_on_duplicate.json
@@ -119,8 +119,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +188,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/win.json b/recipes/engine_1_20_0.expected/win.json
index 1a8b842..20cdd52 100644
--- a/recipes/engine_1_20_0.expected/win.json
+++ b/recipes/engine_1_20_0.expected/win.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/win_maven_or_bitcode.json b/recipes/engine_1_20_0.expected/win_maven_or_bitcode.json
index 1a8b842..20cdd52 100644
--- a/recipes/engine_1_20_0.expected/win_maven_or_bitcode.json
+++ b/recipes/engine_1_20_0.expected/win_maven_or_bitcode.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_20_0.expected/win_maven_or_bitcode_publish_cipd.json
index 1a8b842..20cdd52 100644
--- a/recipes/engine_1_20_0.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/win_maven_or_bitcode_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/win_publish_cipd.json b/recipes/engine_1_20_0.expected/win_publish_cipd.json
index 1a8b842..20cdd52 100644
--- a/recipes/engine_1_20_0.expected/win_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/win_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/win_upload.json b/recipes/engine_1_20_0.expected/win_upload.json
index 83cc75e..6c35c40 100644
--- a/recipes/engine_1_20_0.expected/win_upload.json
+++ b/recipes/engine_1_20_0.expected/win_upload.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/win_upload_maven_or_bitcode.json b/recipes/engine_1_20_0.expected/win_upload_maven_or_bitcode.json
index 83cc75e..6c35c40 100644
--- a/recipes/engine_1_20_0.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_20_0.expected/win_upload_maven_or_bitcode.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_20_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
index 83cc75e..6c35c40 100644
--- a/recipes/engine_1_20_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_20_0.expected/win_upload_publish_cipd.json b/recipes/engine_1_20_0.expected/win_upload_publish_cipd.json
index 83cc75e..6c35c40 100644
--- a/recipes/engine_1_20_0.expected/win_upload_publish_cipd.json
+++ b/recipes/engine_1_20_0.expected/win_upload_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/Linux Fuchsia failing test.json b/recipes/engine_1_21_0.expected/Linux Fuchsia failing test.json
index dad8395..7eb7f5b 100644
--- a/recipes/engine_1_21_0.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine_1_21_0.expected/Linux Fuchsia failing test.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine_1_21_0.expected/Linux Fuchsia skips on duplicate.json
index d415bc4..922da1b 100644
--- a/recipes/engine_1_21_0.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine_1_21_0.expected/Linux Fuchsia skips on duplicate.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/clobber.json b/recipes/engine_1_21_0.expected/clobber.json
index aa4c673..68e5458 100644
--- a/recipes/engine_1_21_0.expected/clobber.json
+++ b/recipes/engine_1_21_0.expected/clobber.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -185,6 +192,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/experimental.json b/recipes/engine_1_21_0.expected/experimental.json
index 918c16c..a19ef64 100644
--- a/recipes/engine_1_21_0.expected/experimental.json
+++ b/recipes/engine_1_21_0.expected/experimental.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/experimental_upload.json b/recipes/engine_1_21_0.expected/experimental_upload.json
index b2bb61e..a38f59d 100644
--- a/recipes/engine_1_21_0.expected/experimental_upload.json
+++ b/recipes/engine_1_21_0.expected/experimental_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/first_bot_update_failed.json b/recipes/engine_1_21_0.expected/first_bot_update_failed.json
index 5e42537..123851e 100644
--- a/recipes/engine_1_21_0.expected/first_bot_update_failed.json
+++ b/recipes/engine_1_21_0.expected/first_bot_update_failed.json
@@ -126,8 +126,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,35 +190,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/vpython",
- "-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Checkout source code.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -220,6 +198,14 @@
"rmtree",
"[CACHE]/builder"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Clobber cache (2)",
"~followup_annotations": [
@@ -236,6 +222,14 @@
"rmtree",
"[CACHE]/git"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Clobber git cache",
"~followup_annotations": [
@@ -254,6 +248,14 @@
"0777",
"[CACHE]/builder"
],
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
"infra_step": true,
"name": "Checkout source code.Ensure checkout cache (2)",
"~followup_annotations": [
@@ -284,8 +286,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -346,6 +355,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/linux.json b/recipes/engine_1_21_0.expected/linux.json
index 5a9fd27..af2b03a 100644
--- a/recipes/engine_1_21_0.expected/linux.json
+++ b/recipes/engine_1_21_0.expected/linux.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/linux_maven_or_bitcode.json b/recipes/engine_1_21_0.expected/linux_maven_or_bitcode.json
index 5a9fd27..af2b03a 100644
--- a/recipes/engine_1_21_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_1_21_0.expected/linux_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_21_0.expected/linux_maven_or_bitcode_publish_cipd.json
index 5a9fd27..af2b03a 100644
--- a/recipes/engine_1_21_0.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/linux_publish_cipd.json b/recipes/engine_1_21_0.expected/linux_publish_cipd.json
index 5a9fd27..af2b03a 100644
--- a/recipes/engine_1_21_0.expected/linux_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/linux_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/linux_upload.json b/recipes/engine_1_21_0.expected/linux_upload.json
index 1aefc7f..ef9600b 100644
--- a/recipes/engine_1_21_0.expected/linux_upload.json
+++ b/recipes/engine_1_21_0.expected/linux_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_1_21_0.expected/linux_upload_maven_or_bitcode.json
index daed87e..9fb507b 100644
--- a/recipes/engine_1_21_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_21_0.expected/linux_upload_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_21_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index 35df3f3..2099a44 100644
--- a/recipes/engine_1_21_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/linux_upload_publish_cipd.json b/recipes/engine_1_21_0.expected/linux_upload_publish_cipd.json
index ce6726c..b4bec93 100644
--- a/recipes/engine_1_21_0.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/linux_upload_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/mac.json b/recipes/engine_1_21_0.expected/mac.json
index 4eb8d8f..b1b26f7 100644
--- a/recipes/engine_1_21_0.expected/mac.json
+++ b/recipes/engine_1_21_0.expected/mac.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_21_0.expected/mac_maven_or_bitcode.json
index 3a6ac05..c0c978e 100644
--- a/recipes/engine_1_21_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_21_0.expected/mac_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_21_0.expected/mac_maven_or_bitcode_publish_cipd.json
index 3a6ac05..c0c978e 100644
--- a/recipes/engine_1_21_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/mac_publish_cipd.json b/recipes/engine_1_21_0.expected/mac_publish_cipd.json
index 4eb8d8f..b1b26f7 100644
--- a/recipes/engine_1_21_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/mac_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/mac_upload.json b/recipes/engine_1_21_0.expected/mac_upload.json
index 7440efa..6644aa9 100644
--- a/recipes/engine_1_21_0.expected/mac_upload.json
+++ b/recipes/engine_1_21_0.expected/mac_upload.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_21_0.expected/mac_upload_maven_or_bitcode.json
index 255b4d8..62a21ae 100644
--- a/recipes/engine_1_21_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_21_0.expected/mac_upload_maven_or_bitcode.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_21_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 255b4d8..62a21ae 100644
--- a/recipes/engine_1_21_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_21_0.expected/mac_upload_publish_cipd.json
index 7440efa..6644aa9 100644
--- a/recipes/engine_1_21_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/mac_upload_publish_cipd.json
@@ -121,8 +121,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -183,6 +190,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/pull_request.json b/recipes/engine_1_21_0.expected/pull_request.json
index 35de62d..14e1b09 100644
--- a/recipes/engine_1_21_0.expected/pull_request.json
+++ b/recipes/engine_1_21_0.expected/pull_request.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -185,6 +192,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/safeupload_raise_on_duplicate.json b/recipes/engine_1_21_0.expected/safeupload_raise_on_duplicate.json
index a8cea82..60c9c8f 100644
--- a/recipes/engine_1_21_0.expected/safeupload_raise_on_duplicate.json
+++ b/recipes/engine_1_21_0.expected/safeupload_raise_on_duplicate.json
@@ -119,8 +119,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +188,15 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/win.json b/recipes/engine_1_21_0.expected/win.json
index 1a8b842..20cdd52 100644
--- a/recipes/engine_1_21_0.expected/win.json
+++ b/recipes/engine_1_21_0.expected/win.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/win_maven_or_bitcode.json b/recipes/engine_1_21_0.expected/win_maven_or_bitcode.json
index 1a8b842..20cdd52 100644
--- a/recipes/engine_1_21_0.expected/win_maven_or_bitcode.json
+++ b/recipes/engine_1_21_0.expected/win_maven_or_bitcode.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_21_0.expected/win_maven_or_bitcode_publish_cipd.json
index 1a8b842..20cdd52 100644
--- a/recipes/engine_1_21_0.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/win_maven_or_bitcode_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/win_publish_cipd.json b/recipes/engine_1_21_0.expected/win_publish_cipd.json
index 1a8b842..20cdd52 100644
--- a/recipes/engine_1_21_0.expected/win_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/win_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/win_upload.json b/recipes/engine_1_21_0.expected/win_upload.json
index 83cc75e..6c35c40 100644
--- a/recipes/engine_1_21_0.expected/win_upload.json
+++ b/recipes/engine_1_21_0.expected/win_upload.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/win_upload_maven_or_bitcode.json b/recipes/engine_1_21_0.expected/win_upload_maven_or_bitcode.json
index 83cc75e..6c35c40 100644
--- a/recipes/engine_1_21_0.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_21_0.expected/win_upload_maven_or_bitcode.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_21_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
index 83cc75e..6c35c40 100644
--- a/recipes/engine_1_21_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/engine_1_21_0.expected/win_upload_publish_cipd.json b/recipes/engine_1_21_0.expected/win_upload_publish_cipd.json
index 83cc75e..6c35c40 100644
--- a/recipes/engine_1_21_0.expected/win_upload_publish_cipd.json
+++ b/recipes/engine_1_21_0.expected/win_upload_publish_cipd.json
@@ -123,8 +123,15 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +203,15 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/femu_test.expected/no_zircon_file.json b/recipes/femu_test.expected/no_zircon_file.json
index a3507d8..229d6fb 100644
--- a/recipes/femu_test.expected/no_zircon_file.json
+++ b/recipes/femu_test.expected/no_zircon_file.json
@@ -75,7 +75,13 @@
"cwd": "[CACHE]/builder",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -136,6 +142,14 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/femu_test.expected/start_femu_with_vdl.json b/recipes/femu_test.expected/start_femu_with_vdl.json
index 895d30b..6e014a6 100644
--- a/recipes/femu_test.expected/start_femu_with_vdl.json
+++ b/recipes/femu_test.expected/start_femu_with_vdl.json
@@ -75,7 +75,13 @@
"cwd": "[CACHE]/builder",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -136,6 +142,14 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/femu_test_1_20_0.expected/no_zircon_file.json b/recipes/femu_test_1_20_0.expected/no_zircon_file.json
index 6b945f4..58368c7 100644
--- a/recipes/femu_test_1_20_0.expected/no_zircon_file.json
+++ b/recipes/femu_test_1_20_0.expected/no_zircon_file.json
@@ -75,7 +75,13 @@
"cwd": "[CACHE]/builder",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -136,6 +142,14 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/femu_test_1_20_0.expected/start_femu_with_vdl.json b/recipes/femu_test_1_20_0.expected/start_femu_with_vdl.json
index 1544c4a..cb6fecf 100644
--- a/recipes/femu_test_1_20_0.expected/start_femu_with_vdl.json
+++ b/recipes/femu_test_1_20_0.expected/start_femu_with_vdl.json
@@ -75,7 +75,13 @@
"cwd": "[CACHE]/builder",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -136,6 +142,14 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine.expected/linux-post-submit.json b/recipes/web_engine.expected/linux-post-submit.json
index 46dc054..8a1f569 100644
--- a/recipes/web_engine.expected/linux-post-submit.json
+++ b/recipes/web_engine.expected/linux-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine.expected/linux-pre-submit.json b/recipes/web_engine.expected/linux-pre-submit.json
index 35e03e7..b2329a1 100644
--- a/recipes/web_engine.expected/linux-pre-submit.json
+++ b/recipes/web_engine.expected/linux-pre-submit.json
@@ -134,8 +134,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +205,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine.expected/mac-post-submit.json b/recipes/web_engine.expected/mac-post-submit.json
index bd4e196..5ca75a8 100644
--- a/recipes/web_engine.expected/mac-post-submit.json
+++ b/recipes/web_engine.expected/mac-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine.expected/windows-post-submit.json b/recipes/web_engine.expected/windows-post-submit.json
index 97880a0..1c4d180 100644
--- a/recipes/web_engine.expected/windows-post-submit.json
+++ b/recipes/web_engine.expected/windows-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]\\builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]\\builder",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine_1_20_0.expected/linux-post-submit.json b/recipes/web_engine_1_20_0.expected/linux-post-submit.json
index 522a2d0..a4bb8ac 100644
--- a/recipes/web_engine_1_20_0.expected/linux-post-submit.json
+++ b/recipes/web_engine_1_20_0.expected/linux-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine_1_20_0.expected/linux-pre-submit.json b/recipes/web_engine_1_20_0.expected/linux-pre-submit.json
index c582361..340aec5 100644
--- a/recipes/web_engine_1_20_0.expected/linux-pre-submit.json
+++ b/recipes/web_engine_1_20_0.expected/linux-pre-submit.json
@@ -134,8 +134,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +205,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine_1_20_0.expected/mac-post-submit.json b/recipes/web_engine_1_20_0.expected/mac-post-submit.json
index 2b4bc07..65a9754 100644
--- a/recipes/web_engine_1_20_0.expected/mac-post-submit.json
+++ b/recipes/web_engine_1_20_0.expected/mac-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine_1_20_0.expected/windows-post-submit.json b/recipes/web_engine_1_20_0.expected/windows-post-submit.json
index 3f5c678..b4e81f2 100644
--- a/recipes/web_engine_1_20_0.expected/windows-post-submit.json
+++ b/recipes/web_engine_1_20_0.expected/windows-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]\\builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]\\builder",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine_1_21_0.expected/linux-post-submit.json b/recipes/web_engine_1_21_0.expected/linux-post-submit.json
index 46dc054..8a1f569 100644
--- a/recipes/web_engine_1_21_0.expected/linux-post-submit.json
+++ b/recipes/web_engine_1_21_0.expected/linux-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine_1_21_0.expected/linux-pre-submit.json b/recipes/web_engine_1_21_0.expected/linux-pre-submit.json
index 35e03e7..b2329a1 100644
--- a/recipes/web_engine_1_21_0.expected/linux-pre-submit.json
+++ b/recipes/web_engine_1_21_0.expected/linux-pre-submit.json
@@ -134,8 +134,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -196,6 +205,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine_1_21_0.expected/mac-post-submit.json b/recipes/web_engine_1_21_0.expected/mac-post-submit.json
index bd4e196..5ca75a8 100644
--- a/recipes/web_engine_1_21_0.expected/mac-post-submit.json
+++ b/recipes/web_engine_1_21_0.expected/mac-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]/builder",
"env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]/builder",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
diff --git a/recipes/web_engine_1_21_0.expected/windows-post-submit.json b/recipes/web_engine_1_21_0.expected/windows-post-submit.json
index 97880a0..1c4d180 100644
--- a/recipes/web_engine_1_21_0.expected/windows-post-submit.json
+++ b/recipes/web_engine_1_21_0.expected/windows-post-submit.json
@@ -119,8 +119,17 @@
],
"cwd": "[CACHE]\\builder",
"env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]\\builder",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "300"
+ "GIT_HTTP_LOW_SPEED_TIME": "300",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
@@ -181,6 +190,17 @@
"runhooks"
],
"cwd": "[CACHE]\\builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
+ "CHROME_NO_SANDBOX": "true",
+ "ENGINE_PATH": "[CACHE]\\builder",
+ "GOMA_DIR": "[CACHE]\\goma\\client"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
