Add depot_tool to the path of gn_script calls. The gn script expects depot_tools to be in the path. Some scripts like vs_toolchain update require depot_tools on path. Change-Id: If568ce9b1e4216d6da70639732f769ff8f0640ee Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/42462 Commit-Queue: Godofredo Contreras <godofredoc@google.com> Commit-Queue: Dan Field <dnfield@google.com> Reviewed-by: Dan Field <dnfield@google.com>
diff --git a/recipe_modules/build_util/api.py b/recipe_modules/build_util/api.py index b831d45..7d22c15 100644 --- a/recipe_modules/build_util/api.py +++ b/recipe_modules/build_util/api.py
@@ -28,7 +28,9 @@ gn_args += ('--no-lto',) gn_cmd.extend(gn_args) env = {'GOMA_DIR': self.m.goma.goma_dir} - with self.m.goma(), self.m.context(env=env): + # Some gn configurations expect depot_tools in path. e.g. vs_studio + # tool_chain update script. + with self.m.goma(), self.m.context(env=env), self.m.depot_tools.on_path(): self.m.step('gn %s' % ' '.join(gn_args), gn_cmd) def _calculate_j_value(self):
diff --git a/recipe_modules/build_util/examples/full.expected/basic.json b/recipe_modules/build_util/examples/full.expected/basic.json index 7a3b458..f2f2e0c 100644 --- a/recipe_modules/build_util/examples/full.expected/basic.json +++ b/recipe_modules/build_util/examples/full.expected/basic.json
@@ -192,6 +192,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "name": "gn --no-lto" }, { @@ -543,6 +551,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "name": "gn --no-goma --no-lto" }, {
diff --git a/recipe_modules/build_util/examples/full.expected/mac.json b/recipe_modules/build_util/examples/full.expected/mac.json index 7a3b458..f2f2e0c 100644 --- a/recipe_modules/build_util/examples/full.expected/mac.json +++ b/recipe_modules/build_util/examples/full.expected/mac.json
@@ -192,6 +192,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "name": "gn --no-lto" }, { @@ -543,6 +551,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "name": "gn --no-goma --no-lto" }, {
diff --git a/recipe_modules/build_util/examples/full.expected/win.json b/recipe_modules/build_util/examples/full.expected/win.json index 851f9b8..1a550be 100644 --- a/recipe_modules/build_util/examples/full.expected/win.json +++ b/recipe_modules/build_util/examples/full.expected/win.json
@@ -196,6 +196,14 @@ "GOMA_TMP_DIR": "[CLEANUP]\\goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "name": "gn --no-lto" }, { @@ -555,6 +563,14 @@ "GOMA_TMP_DIR": "[CLEANUP]\\goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "name": "gn --no-goma --no-lto" }, {
diff --git a/recipes/engine/engine_lint.expected/host arch arm64.json b/recipes/engine/engine_lint.expected/host arch arm64.json index e9929f3..eae989e 100644 --- a/recipes/engine/engine_lint.expected/host arch arm64.json +++ b/recipes/engine/engine_lint.expected/host arch arm64.json
@@ -718,9 +718,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1018,9 +1020,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/host arch x86.json b/recipes/engine/engine_lint.expected/host arch x86.json index 2473f25..1dbbec0 100644 --- a/recipes/engine/engine_lint.expected/host arch x86.json +++ b/recipes/engine/engine_lint.expected/host arch x86.json
@@ -717,9 +717,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1016,9 +1018,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/ios arch arm64.json b/recipes/engine/engine_lint.expected/ios arch arm64.json index 2cfb4a1..b81040d 100644 --- a/recipes/engine/engine_lint.expected/ios arch arm64.json +++ b/recipes/engine/engine_lint.expected/ios arch arm64.json
@@ -718,9 +718,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1018,9 +1020,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/ios arch x86.json b/recipes/engine/engine_lint.expected/ios arch x86.json index 82a0798..3b6ab3b 100644 --- a/recipes/engine/engine_lint.expected/ios arch x86.json +++ b/recipes/engine/engine_lint.expected/ios arch x86.json
@@ -717,9 +717,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1016,9 +1018,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/linux android all.json b/recipes/engine/engine_lint.expected/linux android all.json index 778038c..29e06a1 100644 --- a/recipes/engine/engine_lint.expected/linux android all.json +++ b/recipes/engine/engine_lint.expected/linux android all.json
@@ -666,9 +666,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1290,9 +1292,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/linux android branch.json b/recipes/engine/engine_lint.expected/linux android branch.json index 778038c..29e06a1 100644 --- a/recipes/engine/engine_lint.expected/linux android branch.json +++ b/recipes/engine/engine_lint.expected/linux android branch.json
@@ -666,9 +666,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1290,9 +1292,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/linux android head.json b/recipes/engine/engine_lint.expected/linux android head.json index 2852432..a74f043 100644 --- a/recipes/engine/engine_lint.expected/linux android head.json +++ b/recipes/engine/engine_lint.expected/linux android head.json
@@ -666,9 +666,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1290,9 +1292,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/linux host all.json b/recipes/engine/engine_lint.expected/linux host all.json index 778038c..29e06a1 100644 --- a/recipes/engine/engine_lint.expected/linux host all.json +++ b/recipes/engine/engine_lint.expected/linux host all.json
@@ -666,9 +666,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1290,9 +1292,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/linux host branch.json b/recipes/engine/engine_lint.expected/linux host branch.json index 778038c..29e06a1 100644 --- a/recipes/engine/engine_lint.expected/linux host branch.json +++ b/recipes/engine/engine_lint.expected/linux host branch.json
@@ -666,9 +666,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1290,9 +1292,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/linux host head.json b/recipes/engine/engine_lint.expected/linux host head.json index 2852432..a74f043 100644 --- a/recipes/engine/engine_lint.expected/linux host head.json +++ b/recipes/engine/engine_lint.expected/linux host head.json
@@ -666,9 +666,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1290,9 +1292,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/mac host all.json b/recipes/engine/engine_lint.expected/mac host all.json index 160b0e9..5260658 100644 --- a/recipes/engine/engine_lint.expected/mac host all.json +++ b/recipes/engine/engine_lint.expected/mac host all.json
@@ -961,9 +961,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1585,9 +1587,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/mac host branch.json b/recipes/engine/engine_lint.expected/mac host branch.json index 160b0e9..5260658 100644 --- a/recipes/engine/engine_lint.expected/mac host branch.json +++ b/recipes/engine/engine_lint.expected/mac host branch.json
@@ -961,9 +961,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1585,9 +1587,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/mac host head.json b/recipes/engine/engine_lint.expected/mac host head.json index 983c7d5..4e5efcb 100644 --- a/recipes/engine/engine_lint.expected/mac host head.json +++ b/recipes/engine/engine_lint.expected/mac host head.json
@@ -961,9 +961,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1585,9 +1587,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/mac ios all.json b/recipes/engine/engine_lint.expected/mac ios all.json index 160b0e9..5260658 100644 --- a/recipes/engine/engine_lint.expected/mac ios all.json +++ b/recipes/engine/engine_lint.expected/mac ios all.json
@@ -961,9 +961,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1585,9 +1587,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/mac ios branch.json b/recipes/engine/engine_lint.expected/mac ios branch.json index 160b0e9..5260658 100644 --- a/recipes/engine/engine_lint.expected/mac ios branch.json +++ b/recipes/engine/engine_lint.expected/mac ios branch.json
@@ -961,9 +961,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1585,9 +1587,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_lint.expected/mac ios head.json b/recipes/engine/engine_lint.expected/mac ios head.json index 983c7d5..4e5efcb 100644 --- a/recipes/engine/engine_lint.expected/mac ios head.json +++ b/recipes/engine/engine_lint.expected/mac ios head.json
@@ -961,9 +961,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -1585,9 +1587,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_metrics.expected/basic_upload_metrics_False.json b/recipes/engine/engine_metrics.expected/basic_upload_metrics_False.json index 9844f7a..4d4408e 100644 --- a/recipes/engine/engine_metrics.expected/basic_upload_metrics_False.json +++ b/recipes/engine/engine_metrics.expected/basic_upload_metrics_False.json
@@ -412,9 +412,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_metrics.expected/basic_upload_metrics_True.json b/recipes/engine/engine_metrics.expected/basic_upload_metrics_True.json index fb124a1..29a89ac 100644 --- a/recipes/engine/engine_metrics.expected/basic_upload_metrics_True.json +++ b/recipes/engine/engine_metrics.expected/basic_upload_metrics_True.json
@@ -412,9 +412,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_unopt.expected/linux.json b/recipes/engine/engine_unopt.expected/linux.json index 9e88622..5ea9e10 100644 --- a/recipes/engine/engine_unopt.expected/linux.json +++ b/recipes/engine/engine_unopt.expected/linux.json
@@ -896,9 +896,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -2004,9 +2006,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -3008,9 +3012,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_unopt.expected/linux_lto.json b/recipes/engine/engine_unopt.expected/linux_lto.json index ed03033..70a73b1 100644 --- a/recipes/engine/engine_unopt.expected/linux_lto.json +++ b/recipes/engine/engine_unopt.expected/linux_lto.json
@@ -895,9 +895,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -2002,9 +2004,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -3005,9 +3009,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_unopt.expected/mac.json b/recipes/engine/engine_unopt.expected/mac.json index b850529..0187fdc 100644 --- a/recipes/engine/engine_unopt.expected/mac.json +++ b/recipes/engine/engine_unopt.expected/mac.json
@@ -986,9 +986,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -2095,9 +2097,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_unopt.expected/mac_lto.json b/recipes/engine/engine_unopt.expected/mac_lto.json index b850529..0187fdc 100644 --- a/recipes/engine/engine_unopt.expected/mac_lto.json +++ b/recipes/engine/engine_unopt.expected/mac_lto.json
@@ -986,9 +986,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] }, @@ -2095,9 +2097,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_unopt.expected/win.json b/recipes/engine/engine_unopt.expected/win.json index 03f9643..38e8fc5 100644 --- a/recipes/engine/engine_unopt.expected/win.json +++ b/recipes/engine/engine_unopt.expected/win.json
@@ -804,9 +804,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/engine_unopt.expected/win_lto.json b/recipes/engine/engine_unopt.expected/win_lto.json index 6ed744d..a49387d 100644 --- a/recipes/engine/engine_unopt.expected/win_lto.json +++ b/recipes/engine/engine_unopt.expected/win_lto.json
@@ -803,9 +803,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/framework_smoke.expected/basic.json b/recipes/engine/framework_smoke.expected/basic.json index 29fe38e..2f0cd60 100644 --- a/recipes/engine/framework_smoke.expected/basic.json +++ b/recipes/engine/framework_smoke.expected/basic.json
@@ -338,6 +338,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "name": "Build host_debug_unopt.gn --unoptimized --prebuilt-dart-sdk", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine/framework_smoke.expected/no_goma.json b/recipes/engine/framework_smoke.expected/no_goma.json index 29fe38e..2f0cd60 100644 --- a/recipes/engine/framework_smoke.expected/no_goma.json +++ b/recipes/engine/framework_smoke.expected/no_goma.json
@@ -338,6 +338,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "name": "Build host_debug_unopt.gn --unoptimized --prebuilt-dart-sdk", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine/web_engine.expected/basic.json b/recipes/engine/web_engine.expected/basic.json index 7d2d1a0..7e0758d 100644 --- a/recipes/engine/web_engine.expected/basic.json +++ b/recipes/engine/web_engine.expected/basic.json
@@ -862,9 +862,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json index e13a1c9..e81c38c 100644 --- a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json +++ b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
@@ -908,9 +908,11 @@ }, "env_suffixes": { "DEPOT_TOOLS_UPDATE": [ + "0", "0" ], "PATH": [ + "RECIPE_REPO[depot_tools]", "RECIPE_REPO[depot_tools]" ] },
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json index dc34ee7..1b82ed5 100644 --- a/recipes/engine_v2/builder.expected/basic.json +++ b/recipes/engine_v2/builder.expected/basic.json
@@ -468,6 +468,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "luci_context": { "realm": { "name": "flutter:prod"
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter.json b/recipes/engine_v2/builder.expected/dart-internal-flutter.json index 2521ddc..5439a2b 100644 --- a/recipes/engine_v2/builder.expected/dart-internal-flutter.json +++ b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
@@ -575,6 +575,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "luci_context": { "realm": { "name": "dart-internal:flutter"
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json index df35bd5..853b918 100644 --- a/recipes/engine_v2/builder.expected/mac.json +++ b/recipes/engine_v2/builder.expected/mac.json
@@ -602,6 +602,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "luci_context": { "realm": { "name": "flutter:prod"
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json index 756e52d..6c8c385 100644 --- a/recipes/engine_v2/builder.expected/monorepo.json +++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -524,6 +524,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "luci_context": { "realm": { "name": "dart:ci.sandbox"
diff --git a/recipes/engine_v2/builder.expected/monorepo_tryjob.json b/recipes/engine_v2/builder.expected/monorepo_tryjob.json index dad7dbb..e9cc525 100644 --- a/recipes/engine_v2/builder.expected/monorepo_tryjob.json +++ b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
@@ -608,6 +608,14 @@ "GOMA_TMP_DIR": "[CLEANUP]/goma", "GOMA_USE_LOCAL": "False" }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, "luci_context": { "realm": { "name": "dart:ci.sandbox"