Fix paths for engine environment.
The engine environment methods was setting up the path to dart binaries
incorrectly.
Bug: https://github.com/flutter/flutter/issues/81855
Change-Id: I42ba608504475c37391efb52c4526b683abc4278
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/33520
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index 711a0bf..8bed505 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -356,10 +356,10 @@
def engine_environment(self, checkout_path):
"""Returns env and env_prefixes of an flutter/dart command environment."""
dart_bin = checkout_path.join(
- 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin'
+ 'src', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin'
)
git_ref = self.m.properties.get('git_ref', '')
- android_home = checkout_path.join('third_party', 'android_tools', 'sdk')
+ android_home = checkout_path.join('src', 'third_party', 'android_tools', 'sdk')
env = {
# Windows Packaging script assumes this is set.
'DEPOT_TOOLS':
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 0c27dc2..8dff901 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json
@@ -54,7 +54,7 @@
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -135,7 +135,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -632,7 +632,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -660,7 +660,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -687,7 +687,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -718,7 +718,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -750,7 +750,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -783,7 +783,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -817,7 +817,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -850,7 +850,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -884,7 +884,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -917,7 +917,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -952,7 +952,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/builder.expected/basic_custom_vars.json b/recipes/engine_v2/builder.expected/basic_custom_vars.json
index 51a5d5c..03b5f91 100644
--- a/recipes/engine_v2/builder.expected/basic_custom_vars.json
+++ b/recipes/engine_v2/builder.expected/basic_custom_vars.json
@@ -54,7 +54,7 @@
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -135,7 +135,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -632,7 +632,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -660,7 +660,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -691,7 +691,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -723,7 +723,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -756,7 +756,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -790,7 +790,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -823,7 +823,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -857,7 +857,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -890,7 +890,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -925,7 +925,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/builder.expected/basic_gcs.json b/recipes/engine_v2/builder.expected/basic_gcs.json
index 705dd5d..cb186b1 100644
--- a/recipes/engine_v2/builder.expected/basic_gcs.json
+++ b/recipes/engine_v2/builder.expected/basic_gcs.json
@@ -54,7 +54,7 @@
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -135,7 +135,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -632,7 +632,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -660,7 +660,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -687,7 +687,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -718,7 +718,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -750,7 +750,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -783,7 +783,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -817,7 +817,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -850,7 +850,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -884,7 +884,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -917,7 +917,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -945,7 +945,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -980,7 +980,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1018,7 +1018,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index ec83778..09d2439 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -54,7 +54,7 @@
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -135,7 +135,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -706,7 +706,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -734,7 +734,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -761,7 +761,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -792,7 +792,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -824,7 +824,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -857,7 +857,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -891,7 +891,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -924,7 +924,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -958,7 +958,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -991,7 +991,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1026,7 +1026,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index 6cb8aae..f8cf517 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -80,7 +80,7 @@
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -230,7 +230,7 @@
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1116,7 +1116,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1156,7 +1156,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1195,7 +1195,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1238,7 +1238,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1282,7 +1282,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1327,7 +1327,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1373,7 +1373,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1418,7 +1418,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1464,7 +1464,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1509,7 +1509,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1556,7 +1556,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/builder.expected/monorepo_gcs.json b/recipes/engine_v2/builder.expected/monorepo_gcs.json
index 4e00745..a7b6d04 100644
--- a/recipes/engine_v2/builder.expected/monorepo_gcs.json
+++ b/recipes/engine_v2/builder.expected/monorepo_gcs.json
@@ -80,7 +80,7 @@
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@@ -230,7 +230,7 @@
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "dart/ci.sandbox/builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1116,7 +1116,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1156,7 +1156,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1195,7 +1195,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1238,7 +1238,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1282,7 +1282,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1327,7 +1327,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1373,7 +1373,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1418,7 +1418,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1464,7 +1464,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1509,7 +1509,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1549,7 +1549,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1596,7 +1596,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1646,7 +1646,7 @@
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/src",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py
index 01128cf..c7aa80c 100644
--- a/recipes/engine_v2/builder.py
+++ b/recipes/engine_v2/builder.py
@@ -196,7 +196,7 @@
# Enable long path support on Windows.
api.os_utils.enable_long_paths()
- env, env_prefixes = api.repo_util.engine_environment(checkout)
+ env, env_prefixes = api.repo_util.engine_environment(api.path['cache'].join('builder'))
# Engine path is used inconsistently across the engine repo. We'll start
# with [cache]/builder and will adjust it to start using it consistently.
diff --git a/recipes/engine_v2/engine_v2.expected/basic_linux.json b/recipes/engine_v2/engine_v2.expected/basic_linux.json
index c77ada2..2f0a42c 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_linux.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_linux.json
@@ -466,7 +466,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
@@ -480,7 +480,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -553,7 +553,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
@@ -569,7 +569,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -646,7 +646,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
@@ -660,7 +660,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -731,7 +731,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
@@ -773,7 +773,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 49c8b8f..57ac209 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -474,7 +474,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
@@ -488,7 +488,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -561,7 +561,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
@@ -577,7 +577,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -654,7 +654,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
@@ -668,7 +668,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -886,7 +886,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
@@ -928,7 +928,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
diff --git a/recipes/engine_v2/engine_v2.expected/config_from_file.json b/recipes/engine_v2/engine_v2.expected/config_from_file.json
index 0c1d7c4..d6a9003 100644
--- a/recipes/engine_v2/engine_v2.expected/config_from_file.json
+++ b/recipes/engine_v2/engine_v2.expected/config_from_file.json
@@ -682,7 +682,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
@@ -696,7 +696,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -769,7 +769,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
@@ -785,7 +785,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -862,7 +862,7 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
@@ -876,7 +876,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
