chore: De-fuse recipes/engine and friends.
Change-Id: Ibf554f982c894dd03d2a86691059fd2e0a42e50a
Bug: https://github.com/flutter/flutter/issues/170843
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/66764
Reviewed-by: John McDole <codefu@google.com>
Commit-Queue: Matan Lurey <matanl@google.com>
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index 1e6629c..cc16beb 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -131,7 +131,7 @@
# with self.m.context(cwd=checkout_path):
# self.m.gclient('git clean all repos', ['recurse', 'git', 'clean', '-fdx'])
- engine_repo = 'flutter' if self.is_fusion() else 'engine'
+ engine_repo = 'flutter'
git_url = REPOS[engine_repo]
git_id = self.m.buildbucket.gitiles_commit.id
git_ref = self.m.buildbucket.gitiles_commit.ref
@@ -140,8 +140,8 @@
git_id = self.m.properties['git_ref']
git_ref = self.m.properties['git_ref']
- repo_path = '.' if self.is_fusion() else 'src/flutter'
- default_branch = REPO_BRANCHES['flutter'] if self.is_fusion() else REPO_BRANCHES['engine']
+ repo_path = '.'
+ default_branch = REPO_BRANCHES['flutter']
# Inner function to execute code a second time in case of failure.
# pylint: disable=unused-argument
@@ -485,7 +485,7 @@
def engine_environment(self, checkout_path):
"""Returns env and env_prefixes of an flutter/dart command environment."""
- engine_path = checkout_path / 'engine' if self.is_fusion() else checkout_path
+ engine_path = checkout_path / 'engine'
dart_bin = (
engine_path / 'src/flutter/third_party/dart/tools/sdks/dart-sdk/bin'
)
@@ -634,10 +634,8 @@
"""
if self.m.monorepo.is_monorepo_ci_build or self.m.monorepo.is_monorepo_try_build:
project = 'monorepo'
- elif self.is_fusion():
- project = 'flutter'
else:
- project = 'engine'
+ project = 'flutter'
build = self.m.properties.get('build', None)
if not build:
self.checkout(
@@ -652,14 +650,9 @@
def ReadBuildConfig(self, checkout_path):
"""Reads an standalone build configuration."""
config_name = self.m.properties.get('config_name')
- if self.is_fusion():
- config_path = (
- checkout_path / f'flutter/engine/src/flutter/ci/builders/standalone/{config_name}.json'
- )
- else:
- config_path = (
- checkout_path / f'flutter/ci/builders/standalone/{config_name}.json'
- )
+ config_path = (
+ checkout_path / f'flutter/engine/src/flutter/ci/builders/standalone/{config_name}.json'
+ )
config = self.m.file.read_json(
'Read build config file',
config_path,
@@ -668,7 +661,3 @@
}
)
return config
-
- def is_fusion(self):
- """Returns true if this build is using a merged framework+engine repository"""
- return self.m.properties.get('is_fusion', False)
diff --git a/recipe_modules/repo_util/examples/full.expected/bot_update.json b/recipe_modules/repo_util/examples/full.expected/bot_update.json
index 47bea94..9c4aed3 100644
--- a/recipe_modules/repo_util/examples/full.expected/bot_update.json
+++ b/recipe_modules/repo_util/examples/full.expected/bot_update.json
@@ -639,9 +639,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -649,7 +649,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/pull/1/head",
+ ".@refs/pull/1/head",
"--refs",
"refs/pull/1/head"
],
@@ -685,27 +685,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/pull/1/head\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/pull/1/head\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"a63681edc0f69a72604596b16c7986513e809995\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3466849351759a9d769091ecc5768f8e9e417424\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -714,9 +714,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"a63681edc0f69a72604596b16c7986513e809995\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -743,7 +743,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine (2)"
+ "name": "Checkout flutter/flutter (3)"
},
{
"cmd": [
@@ -755,7 +755,7 @@
"--url",
"https://github.com/flutter/engine"
],
- "name": "Checkout flutter/engine (2).git setup",
+ "name": "Checkout flutter/flutter (3).git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -775,7 +775,7 @@
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
- "name": "Checkout flutter/engine (2).git fetch",
+ "name": "Checkout flutter/flutter (3).git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -789,7 +789,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git checkout",
+ "name": "Checkout flutter/flutter (3).git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -802,7 +802,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).read revision",
+ "name": "Checkout flutter/flutter (3).read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -819,7 +819,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git clean",
+ "name": "Checkout flutter/flutter (3).git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -832,7 +832,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule sync",
+ "name": "Checkout flutter/flutter (3).submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -847,7 +847,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule update",
+ "name": "Checkout flutter/flutter (3).submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -860,7 +860,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
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 66b7b1e..6c81d65 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
@@ -642,9 +642,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -652,7 +652,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/pull/1/head",
+ ".@refs/pull/1/head",
"--refs",
"refs/pull/1/head"
],
@@ -688,27 +688,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/pull/1/head\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/pull/1/head\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"a63681edc0f69a72604596b16c7986513e809995\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3466849351759a9d769091ecc5768f8e9e417424\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -717,9 +717,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"a63681edc0f69a72604596b16c7986513e809995\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_EXCEPTION@@@"
]
},
@@ -871,9 +871,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -881,7 +881,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/pull/1/head",
+ ".@refs/pull/1/head",
"--refs",
"refs/pull/1/head"
],
@@ -917,27 +917,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/pull/1/head\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/pull/1/head\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"a63681edc0f69a72604596b16c7986513e809995\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3466849351759a9d769091ecc5768f8e9e417424\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -946,9 +946,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"a63681edc0f69a72604596b16c7986513e809995\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -975,7 +975,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine (2)"
+ "name": "Checkout flutter/flutter (3)"
},
{
"cmd": [
@@ -987,7 +987,7 @@
"--url",
"https://github.com/flutter/engine"
],
- "name": "Checkout flutter/engine (2).git setup",
+ "name": "Checkout flutter/flutter (3).git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1007,7 +1007,7 @@
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
- "name": "Checkout flutter/engine (2).git fetch",
+ "name": "Checkout flutter/flutter (3).git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1021,7 +1021,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git checkout",
+ "name": "Checkout flutter/flutter (3).git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1034,7 +1034,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).read revision",
+ "name": "Checkout flutter/flutter (3).read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -1051,7 +1051,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git clean",
+ "name": "Checkout flutter/flutter (3).git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1064,7 +1064,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule sync",
+ "name": "Checkout flutter/flutter (3).submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1079,7 +1079,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule update",
+ "name": "Checkout flutter/flutter (3).submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1092,7 +1092,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/first_bot_update_revision_not_found.json b/recipe_modules/repo_util/examples/full.expected/first_bot_update_revision_not_found.json
index 50e0e34..9d8db55 100644
--- a/recipe_modules/repo_util/examples/full.expected/first_bot_update_revision_not_found.json
+++ b/recipe_modules/repo_util/examples/full.expected/first_bot_update_revision_not_found.json
@@ -658,9 +658,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -668,7 +668,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/pull/1/head",
+ ".@refs/pull/1/head",
"--refs",
"refs/pull/1/head"
],
@@ -805,9 +805,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -815,7 +815,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/pull/1/head",
+ ".@refs/pull/1/head",
"--refs",
"refs/pull/1/head"
],
@@ -851,27 +851,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/pull/1/head\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/pull/1/head\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"a63681edc0f69a72604596b16c7986513e809995\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3466849351759a9d769091ecc5768f8e9e417424\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -880,9 +880,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"a63681edc0f69a72604596b16c7986513e809995\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -909,7 +909,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine (2)"
+ "name": "Checkout flutter/flutter (3)"
},
{
"cmd": [
@@ -921,7 +921,7 @@
"--url",
"https://github.com/flutter/engine"
],
- "name": "Checkout flutter/engine (2).git setup",
+ "name": "Checkout flutter/flutter (3).git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -941,7 +941,7 @@
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
- "name": "Checkout flutter/engine (2).git fetch",
+ "name": "Checkout flutter/flutter (3).git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -955,7 +955,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git checkout",
+ "name": "Checkout flutter/flutter (3).git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -968,7 +968,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).read revision",
+ "name": "Checkout flutter/flutter (3).read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -985,7 +985,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git clean",
+ "name": "Checkout flutter/flutter (3).git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -998,7 +998,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule sync",
+ "name": "Checkout flutter/flutter (3).submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1013,7 +1013,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule update",
+ "name": "Checkout flutter/flutter (3).submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1026,7 +1026,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/mac.json b/recipe_modules/repo_util/examples/full.expected/mac.json
index c298036..3a8a646 100644
--- a/recipe_modules/repo_util/examples/full.expected/mac.json
+++ b/recipe_modules/repo_util/examples/full.expected/mac.json
@@ -851,9 +851,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -861,7 +861,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/pull/1/head",
+ ".@refs/pull/1/head",
"--refs",
"refs/pull/1/head"
],
@@ -897,27 +897,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/pull/1/head\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/pull/1/head\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"a63681edc0f69a72604596b16c7986513e809995\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3466849351759a9d769091ecc5768f8e9e417424\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -926,9 +926,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"a63681edc0f69a72604596b16c7986513e809995\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -955,7 +955,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine (2)"
+ "name": "Checkout flutter/flutter (3)"
},
{
"cmd": [
@@ -967,7 +967,7 @@
"--url",
"https://github.com/flutter/engine"
],
- "name": "Checkout flutter/engine (2).git setup",
+ "name": "Checkout flutter/flutter (3).git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -987,7 +987,7 @@
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
- "name": "Checkout flutter/engine (2).git fetch",
+ "name": "Checkout flutter/flutter (3).git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1001,7 +1001,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git checkout",
+ "name": "Checkout flutter/flutter (3).git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1014,7 +1014,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).read revision",
+ "name": "Checkout flutter/flutter (3).read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -1031,7 +1031,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git clean",
+ "name": "Checkout flutter/flutter (3).git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1044,7 +1044,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule sync",
+ "name": "Checkout flutter/flutter (3).submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1059,7 +1059,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule update",
+ "name": "Checkout flutter/flutter (3).submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1072,7 +1072,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/mac_release_candidate.json b/recipe_modules/repo_util/examples/full.expected/mac_release_candidate.json
index fe01cc0..fb9c1f7 100644
--- a/recipe_modules/repo_util/examples/full.expected/mac_release_candidate.json
+++ b/recipe_modules/repo_util/examples/full.expected/mac_release_candidate.json
@@ -891,9 +891,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -901,7 +901,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/heads/flutter-3.2-candidate.5",
+ ".@refs/heads/flutter-3.2-candidate.5",
"--refs",
"refs/heads/flutter-3.2-candidate.5"
],
@@ -937,27 +937,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/heads/flutter-3.2-candidate.5\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/heads/flutter-3.2-candidate.5\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/flutter-3.2-candidate.5@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/flutter-3.2-candidate.5@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -966,9 +966,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/flutter-3.2-candidate.5@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/flutter-3.2-candidate.5@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -995,7 +995,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine (2)"
+ "name": "Checkout flutter/flutter (3)"
},
{
"cmd": [
@@ -1007,7 +1007,7 @@
"--url",
"https://github.com/flutter/engine"
],
- "name": "Checkout flutter/engine (2).git setup",
+ "name": "Checkout flutter/flutter (3).git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1027,7 +1027,7 @@
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
- "name": "Checkout flutter/engine (2).git fetch",
+ "name": "Checkout flutter/flutter (3).git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1041,7 +1041,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git checkout",
+ "name": "Checkout flutter/flutter (3).git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1054,7 +1054,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).read revision",
+ "name": "Checkout flutter/flutter (3).read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -1071,7 +1071,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git clean",
+ "name": "Checkout flutter/flutter (3).git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1084,7 +1084,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule sync",
+ "name": "Checkout flutter/flutter (3).submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1099,7 +1099,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule update",
+ "name": "Checkout flutter/flutter (3).submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1112,7 +1112,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/mac_release_candidate_sha_mismatch.json b/recipe_modules/repo_util/examples/full.expected/mac_release_candidate_sha_mismatch.json
index d6fc49e..5ff5319 100644
--- a/recipe_modules/repo_util/examples/full.expected/mac_release_candidate_sha_mismatch.json
+++ b/recipe_modules/repo_util/examples/full.expected/mac_release_candidate_sha_mismatch.json
@@ -871,9 +871,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -881,7 +881,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/heads/flutter-3.2-candidate.5",
+ ".@refs/heads/flutter-3.2-candidate.5",
"--refs",
"refs/heads/flutter-3.2-candidate.5"
],
@@ -917,27 +917,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/heads/flutter-3.2-candidate.5\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/heads/flutter-3.2-candidate.5\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/flutter-3.2-candidate.5@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/flutter-3.2-candidate.5@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -946,9 +946,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/flutter-3.2-candidate.5@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/flutter-3.2-candidate.5@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -975,7 +975,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine (2)"
+ "name": "Checkout flutter/flutter (3)"
},
{
"cmd": [
@@ -987,7 +987,7 @@
"--url",
"https://github.com/flutter/engine"
],
- "name": "Checkout flutter/engine (2).git setup",
+ "name": "Checkout flutter/flutter (3).git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1007,7 +1007,7 @@
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
- "name": "Checkout flutter/engine (2).git fetch",
+ "name": "Checkout flutter/flutter (3).git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1021,7 +1021,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git checkout",
+ "name": "Checkout flutter/flutter (3).git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1034,7 +1034,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).read revision",
+ "name": "Checkout flutter/flutter (3).read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -1051,7 +1051,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git clean",
+ "name": "Checkout flutter/flutter (3).git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1064,7 +1064,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule sync",
+ "name": "Checkout flutter/flutter (3).submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1079,7 +1079,7 @@
],
"cwd": "[START_DIR]/flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule update",
+ "name": "Checkout flutter/flutter (3).submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1092,7 +1092,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo.json b/recipe_modules/repo_util/examples/full.expected/monorepo.json
index f71e4c0..5ac0c2d 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo.json
@@ -1416,7 +1416,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json b/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json
index d67122b..35efbb9 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json
@@ -1989,7 +1989,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_release.json b/recipe_modules/repo_util/examples/full.expected/monorepo_release.json
index 4a90848..36e1ca5 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo_release.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo_release.json
@@ -1806,7 +1806,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_tryjob.json b/recipe_modules/repo_util/examples/full.expected/monorepo_tryjob.json
index 5e687fb..64fb70b 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo_tryjob.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo_tryjob.json
@@ -1596,7 +1596,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/standalone/build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipe_modules/repo_util/examples/full.expected/win.json b/recipe_modules/repo_util/examples/full.expected/win.json
index 24418a1..31c173c 100644
--- a/recipe_modules/repo_util/examples/full.expected/win.json
+++ b/recipe_modules/repo_util/examples/full.expected/win.json
@@ -850,9 +850,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine'}]",
+ "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://github.com/flutter/engine'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]\\git",
"--cleanup-dir",
@@ -860,7 +860,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@refs/pull/1/head",
+ ".@refs/pull/1/head",
"--refs",
"refs/pull/1/head"
],
@@ -898,27 +898,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/pull/1/head\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/pull/1/head\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"a63681edc0f69a72604596b16c7986513e809995\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3466849351759a9d769091ecc5768f8e9e417424\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/pull/1/head@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a63681edc0f69a72604596b16c7986513e809995\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -927,9 +927,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"a63681edc0f69a72604596b16c7986513e809995\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3466849351759a9d769091ecc5768f8e9e417424\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/pull/1/head@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -1024,7 +1024,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine (2)"
+ "name": "Checkout flutter/flutter (3)"
},
{
"cmd": [
@@ -1036,7 +1036,7 @@
"--url",
"https://github.com/flutter/engine"
],
- "name": "Checkout flutter/engine (2).git setup",
+ "name": "Checkout flutter/flutter (3).git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1056,7 +1056,7 @@
"PATH": "RECIPE_REPO[depot_tools];<PATH>"
},
"infra_step": true,
- "name": "Checkout flutter/engine (2).git fetch",
+ "name": "Checkout flutter/flutter (3).git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1070,7 +1070,7 @@
],
"cwd": "[START_DIR]\\flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git checkout",
+ "name": "Checkout flutter/flutter (3).git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1083,7 +1083,7 @@
],
"cwd": "[START_DIR]\\flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).read revision",
+ "name": "Checkout flutter/flutter (3).read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -1100,7 +1100,7 @@
],
"cwd": "[START_DIR]\\flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).git clean",
+ "name": "Checkout flutter/flutter (3).git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1113,7 +1113,7 @@
],
"cwd": "[START_DIR]\\flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule sync",
+ "name": "Checkout flutter/flutter (3).submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1128,7 +1128,7 @@
],
"cwd": "[START_DIR]\\flutter",
"infra_step": true,
- "name": "Checkout flutter/engine (2).submodule update",
+ "name": "Checkout flutter/flutter (3).submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1141,7 +1141,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]\\flutter\\ci\\builders\\standalone\\build_config.json.json",
+ "[START_DIR]\\flutter\\engine\\src\\flutter\\ci\\builders\\standalone\\build_config.json.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 347b106..269ba29 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json
@@ -31,7 +31,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -174,9 +174,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -184,21 +184,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -219,7 +219,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -253,26 +253,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -283,8 +283,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -296,15 +296,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -316,7 +316,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -426,14 +426,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -447,7 +447,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -509,14 +509,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -540,7 +540,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -583,14 +583,14 @@
"[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -614,7 +614,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -649,14 +649,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -680,7 +680,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -719,14 +719,14 @@
"restart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -750,7 +750,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -774,20 +774,20 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/tools/gn",
+ "[CACHE]/builder/engine/src/flutter/tools/gn",
"--ios",
"--rbe",
"--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -804,7 +804,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -841,14 +841,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -872,7 +872,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -904,14 +904,14 @@
"stat"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -935,7 +935,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -963,14 +963,14 @@
"stop"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -994,7 +994,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1027,14 +1027,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1050,7 +1050,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1085,14 +1085,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1108,7 +1108,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1164,14 +1164,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1187,7 +1187,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1230,14 +1230,14 @@
"[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1253,7 +1253,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1288,14 +1288,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1311,7 +1311,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1350,14 +1350,14 @@
"{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"linux-host\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1373,7 +1373,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1405,14 +1405,14 @@
"restart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1436,7 +1436,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1459,21 +1459,21 @@
},
{
"cmd": [
- "[CACHE]/third_party/ninja/ninja",
+ "[CACHE]/builder/third_party/ninja/ninja",
"-j",
"200",
"-C",
- "[CACHE]/builder/src/out/ios_debug"
+ "[CACHE]/builder/engine/src/out/ios_debug"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1489,7 +1489,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1526,14 +1526,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1557,7 +1557,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1589,14 +1589,14 @@
"stat"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1620,7 +1620,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1648,14 +1648,14 @@
"stop"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1679,7 +1679,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1712,14 +1712,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1735,7 +1735,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1770,14 +1770,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1793,7 +1793,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1830,14 +1830,14 @@
"{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"linux-host\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1853,7 +1853,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1880,16 +1880,16 @@
"pub",
"get"
],
- "cwd": "[CACHE]/builder/src",
+ "cwd": "[CACHE]/builder/engine/src",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1903,8 +1903,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1931,20 +1931,20 @@
},
{
"cmd": [
- "[CACHE]/builder/src/script1.sh",
- "[CACHE]/builder/src/dev/felt.dart",
+ "[CACHE]/builder/engine/src/script1.sh",
+ "[CACHE]/builder/engine/src/dev/felt.dart",
"--argument1"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1958,7 +1958,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1992,16 +1992,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2015,7 +2015,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2052,16 +2052,16 @@
"extra.secret.token.should.not.be.logged",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2075,7 +2075,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2117,16 +2117,16 @@
"0o777",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2140,7 +2140,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2180,16 +2180,16 @@
"",
"[CLEANUP]/flutter_logs_dir/noop.txt"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2203,7 +2203,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2234,21 +2234,21 @@
},
{
"cmd": [
- "[CACHE]/builder/src/myscript.sh",
+ "[CACHE]/builder/engine/src/myscript.sh",
"param1",
"param2",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GCP_PROJECT": "flutter-infra-staging",
@@ -2264,8 +2264,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2309,16 +2309,16 @@
"[CLEANUP]/flutter_logs_dir",
"gs://flutter_logs/flutter/abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd/mytest/00000000-0000-0000-0000-000000001337"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2332,7 +2332,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2373,16 +2373,16 @@
"[CLEANUP]/flutter_logs_dir",
"*"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2396,7 +2396,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2445,16 +2445,16 @@
"[CLEANUP]/flutter_logs_dir",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2468,7 +2468,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2509,16 +2509,16 @@
"remove",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2532,7 +2532,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2566,19 +2566,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2592,7 +2592,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2618,8 +2618,8 @@
},
"name": "Expand directory",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
@@ -2629,16 +2629,16 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2652,7 +2652,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2690,16 +2690,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_5/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2713,7 +2713,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2747,19 +2747,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
"[CLEANUP]/tmp_tmp_5/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2773,7 +2773,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2797,7 +2797,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
},
{
"cmd": [
@@ -2812,16 +2812,16 @@
"[CLEANUP]/tmp_tmp_5/*",
"gs://flutter_infra_release/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2835,7 +2835,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2859,7 +2859,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
]
@@ -2876,16 +2876,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_6/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2899,7 +2899,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2933,19 +2933,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"[CLEANUP]/tmp_tmp_6/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2959,7 +2959,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2983,7 +2983,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
},
{
"cmd": [
@@ -2998,16 +2998,16 @@
"[CLEANUP]/tmp_tmp_6/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3021,7 +3021,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3045,7 +3045,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -3062,16 +3062,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3085,7 +3085,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3119,19 +3119,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3145,7 +3145,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3169,7 +3169,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
},
{
"cmd": [
@@ -3184,16 +3184,16 @@
"[CLEANUP]/tmp_tmp_7/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3207,7 +3207,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3231,7 +3231,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -3244,7 +3244,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/basic_fusion.json b/recipes/engine_v2/builder.expected/basic_fusion.json
deleted file mode 100644
index 110f47b..0000000
--- a/recipes/engine_v2/builder.expected/basic_fusion.json
+++ /dev/null
@@ -1,1065 +0,0 @@
-[
- {
- "cmd": [
- "top",
- "-b",
- "-n",
- "3",
- "-o",
- "%MEM"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "OS info"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/builder/engine/src/out"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Clobber build output"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0o777",
- "[CACHE]/builder"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Ensure checkout cache"
- },
- {
- "cmd": [],
- "name": "Checkout flutter/flutter"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CLEANUP]/tmp_tmp_1/flutter",
- "--url",
- "https://flutter.googlesource.com/mirrors/flutter"
- ],
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout flutter/flutter.git setup",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "--recurse-submodules",
- "--progress",
- "--tags"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout flutter/flutter.git fetch",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout flutter/flutter.git checkout",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout flutter/flutter.read revision",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout flutter/flutter.git clean",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout flutter/flutter.submodule sync",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout flutter/flutter.submodule update",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CLEANUP]/tmp_tmp_1/flutter/engine/src/flutter/ci/builders/standalone/None.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Read build config file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@None.json@{@@@",
- "@@@STEP_LOG_LINE@None.json@ \"name\": \"flutter/build\"@@@",
- "@@@STEP_LOG_LINE@None.json@}@@@",
- "@@@STEP_LOG_END@None.json@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CLEANUP]/tmp_tmp_1"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "temp dir for standalone_repo"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/builder"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Empty [CACHE]/builder",
- "~followup_annotations": [
- "@@@STEP_LOG_END@listdir@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Mount caches"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cat",
- "gs://flutter_archives_v2/caches/builder-linux.json"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Mount caches.gsutil cat",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@",
- "@@@STEP_LOG_LINE@json.output (exception)@Expecting value: line 1 column 1 (char 0)@@@",
- "@@@STEP_LOG_END@json.output (exception)@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Checkout source code"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
- "--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
- "--revision_mapping_file",
- "{\"got_engine_revision\": \".\"}",
- "--git-cache-dir",
- "[CACHE]/git",
- "--cleanup-dir",
- "[CLEANUP]/bot_update",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- ".@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
- "--refs",
- "refs/heads/main"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
- "CLANG_MODULE_CACHE_PATH": "",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/prod-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
- "ENGINE_PATH": "[CACHE]/builder/engine",
- "GIT_BACKENDINFO": "1",
- "GIT_BRANCH": "",
- "GIT_DAPPER_TRACE": "1",
- "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "1800",
- "GIT_SSH_COMMAND": "ssh -o SendEnv=GIT_DAPPER_TRACE -o SendEnv=GIT_BACKENDINFO",
- "GIT_TRACE2_EVENT": "[CLEANUP]/trace2-event",
- "GIT_TRACE_CURL": "[CLEANUP]/trace-curl",
- "GIT_TRACE_CURL_NO_DATA": "1",
- "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_CLEANUP": "[CLEANUP]",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout source code.bot_update",
- "timeout": 2700,
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \".\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
- "@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
- "@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@",
- "@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_REPO[depot_tools]/gclient.py",
- "runhooks"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
- "CLANG_MODULE_CACHE_PATH": "",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/prod-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
- "ENGINE_PATH": "[CACHE]/builder/engine",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_CLEANUP": "[CLEANUP]",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout source code.gclient runhooks",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Initialize logs"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0o777",
- "[CLEANUP]/flutter_logs_dir"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Initialize logs.Ensure [CLEANUP]/flutter_logs_dir",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "",
- "[CLEANUP]/flutter_logs_dir/noop.txt"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Initialize logs.Write noop file",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/engine/src/out/flutter/build",
- "[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Copy flutter/build"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[recipe_engine::cas]/resources/infra.sha1",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "read infra revision",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@infra.sha1@git_revision:mock_infra_git_revision@@@",
- "@@@STEP_LOG_END@infra.sha1@@@"
- ]
- },
- {
- "cmd": [],
- "name": "install infra/tools/luci/cas"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0o777",
- "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "install infra/tools/luci/cas.ensure package directory",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
- "-ensure-file",
- "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "install infra/tools/luci/cas.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-git_revision:moc\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/cas/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": [
- "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
- "archive",
- "-log-level",
- "debug",
- "-cas-instance",
- "projects/example-cas-server/instances/default_instance",
- "-dump-digest",
- "/path/to/tmp/",
- "-paths-json",
- "[[\"[CLEANUP]/out-cas-directory_tmp_1\", \".\"]]"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Archive full build for flutter/build",
- "timeout": 1200.0,
- "~followup_annotations": [
- "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
- ]
- },
- {
- "cmd": [],
- "name": "process logs"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "-m",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/flutter_logs_dir",
- "gs://flutter_logs/engine/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/builder/00000000-0000-0000-0000-000000001337"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "process logs.gsutil upload logs aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@archive logs@https://console.cloud.google.com/storage/browser/flutter_logs/engine/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/builder/00000000-0000-0000-0000-000000001337@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[CLEANUP]/flutter_logs_dir",
- "*"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "process logs.logs",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@glob@[CLEANUP]/flutter_logs_dir/a.txt@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [],
- "name": "log links",
- "~followup_annotations": [
- "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/engine/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/builder/00000000-0000-0000-0000-000000001337/myfile.txt@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CLEANUP]/flutter_logs_dir",
- "--recursive"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "log links.List logs path",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@listdir@[CLEANUP]/flutter_logs_dir/myfile.txt@@@",
- "@@@STEP_LOG_END@listdir@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Set output properties",
- "~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Killing Processes"
- },
- {
- "cmd": [
- "pkill",
- "-e",
- "chrome"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Killing Processes.kill chrome",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "pkill",
- "-e",
- "dart"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Killing Processes.kill dart",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "pkill",
- "-e",
- "flutter"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Killing Processes.kill flutter",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "pkill",
- "-e",
- "java"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Killing Processes.kill java",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "pkill",
- "-e",
- "adb"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Killing Processes.kill adb",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "top",
- "-b",
- "-n",
- "3",
- "-o",
- "%MEM"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "OS info (2)"
- },
- {
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/recipes/engine_v2/builder.expected/config_file.json b/recipes/engine_v2/builder.expected/config_file.json
index fa28cea..55c9a05 100644
--- a/recipes/engine_v2/builder.expected/config_file.json
+++ b/recipes/engine_v2/builder.expected/config_file.json
@@ -31,7 +31,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -77,7 +77,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine"
+ "name": "Checkout flutter/flutter"
},
{
"cmd": [
@@ -87,7 +87,7 @@
"--path",
"[CLEANUP]/tmp_tmp_1/flutter",
"--url",
- "https://flutter.googlesource.com/mirrors/engine"
+ "https://flutter.googlesource.com/mirrors/flutter"
],
"luci_context": {
"realm": {
@@ -101,7 +101,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git setup",
+ "name": "Checkout flutter/flutter.git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -132,7 +132,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git fetch",
+ "name": "Checkout flutter/flutter.git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -158,7 +158,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git checkout",
+ "name": "Checkout flutter/flutter.git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -183,7 +183,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.read revision",
+ "name": "Checkout flutter/flutter.read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -212,7 +212,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git clean",
+ "name": "Checkout flutter/flutter.git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -237,7 +237,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.submodule sync",
+ "name": "Checkout flutter/flutter.submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -264,7 +264,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.submodule update",
+ "name": "Checkout flutter/flutter.submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -277,7 +277,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CLEANUP]/tmp_tmp_1/flutter/ci/builders/standalone/abc.json",
+ "[CLEANUP]/tmp_tmp_1/flutter/engine/src/flutter/ci/builders/standalone/abc.json",
"/path/to/tmp/"
],
"infra_step": true,
@@ -400,9 +400,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -410,21 +410,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -445,7 +445,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -479,26 +479,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -509,8 +509,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -522,15 +522,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -542,7 +542,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -642,7 +642,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
index d4d651d..48e8e8b 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
@@ -97,7 +97,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -225,9 +225,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -235,21 +235,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@2d72510e447ab60a9728aeea2362d8be2cbd7789",
+ ".@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "dart-internal/flutter/builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -270,7 +270,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -304,26 +304,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -334,8 +334,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -347,15 +347,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "dart-internal/flutter/builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -367,7 +367,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -483,7 +483,7 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/tools/gn",
+ "[CACHE]/builder/engine/src/flutter/tools/gn",
"--ios",
"--rbe",
"--no-goma",
@@ -491,14 +491,14 @@
"--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -512,7 +512,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -539,21 +539,21 @@
},
{
"cmd": [
- "[CACHE]/third_party/ninja/ninja",
+ "[CACHE]/builder/third_party/ninja/ninja",
"-C",
- "[CACHE]/builder/src/out/ios_debug",
+ "[CACHE]/builder/engine/src/out/ios_debug",
"-j",
"5"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -567,7 +567,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -598,16 +598,16 @@
"pub",
"get"
],
- "cwd": "[CACHE]/builder/src",
+ "cwd": "[CACHE]/builder/engine/src",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -621,8 +621,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -649,20 +649,20 @@
},
{
"cmd": [
- "[CACHE]/builder/src/script1.sh",
- "[CACHE]/builder/src/dev/felt.dart",
+ "[CACHE]/builder/engine/src/script1.sh",
+ "[CACHE]/builder/engine/src/dev/felt.dart",
"--argument1"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -676,7 +676,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -710,16 +710,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -733,7 +733,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -770,16 +770,16 @@
"extra.secret.token.should.not.be.logged",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -793,7 +793,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -835,16 +835,16 @@
"0o777",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -858,7 +858,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -898,16 +898,16 @@
"",
"[CLEANUP]/flutter_logs_dir/noop.txt"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -921,7 +921,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -952,21 +952,21 @@
},
{
"cmd": [
- "[CACHE]/builder/src/myscript.sh",
+ "[CACHE]/builder/engine/src/myscript.sh",
"param1",
"param2",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GCP_PROJECT": "flutter-infra-staging",
@@ -982,8 +982,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1027,16 +1027,16 @@
"[CLEANUP]/flutter_logs_dir",
"gs://flutter_logs/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/mytest/00000000-0000-0000-0000-000000001337"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1050,7 +1050,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1091,16 +1091,16 @@
"[CLEANUP]/flutter_logs_dir",
"*"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1114,7 +1114,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1163,16 +1163,16 @@
"[CLEANUP]/flutter_logs_dir",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1186,7 +1186,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1227,16 +1227,16 @@
"remove",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1250,7 +1250,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1283,16 +1283,16 @@
"-stage",
"upload"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1306,7 +1306,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1339,19 +1339,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1365,7 +1365,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1391,8 +1391,8 @@
},
"name": "Expand directory",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
@@ -1402,16 +1402,16 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1425,7 +1425,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1463,16 +1463,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_5/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1486,7 +1486,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1520,19 +1520,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
"[CLEANUP]/tmp_tmp_5/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1546,7 +1546,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1570,7 +1570,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
},
{
"cmd": [
@@ -1585,16 +1585,16 @@
"[CLEANUP]/tmp_tmp_5/*",
"gs://flutter_infra_release/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1608,7 +1608,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1632,7 +1632,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
]
@@ -1645,18 +1645,18 @@
"--json-output",
"/path/to/tmp/json",
"file_hash",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip"
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1670,7 +1670,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1696,7 +1696,7 @@
},
"name": "Compute file hash",
"~followup_annotations": [
- "@@@STEP_TEXT@Hash calculated: 514e872bece8d7ee7d52fd8e7ef7b801e964e9d45bf1b7c084369533781038c7@@@"
+ "@@@STEP_TEXT@Hash calculated: abb4642e8b0c7564f865c094deaf32b43a3df8974da0bf1cf8e89169b4abc42e@@@"
]
},
{
@@ -1704,20 +1704,20 @@
"[START_DIR]/reporter/snoopy_broker",
"-report-gcs",
"-digest",
- "514e872bece8d7ee7d52fd8e7ef7b801e964e9d45bf1b7c084369533781038c7",
+ "abb4642e8b0c7564f865c094deaf32b43a3df8974da0bf1cf8e89169b4abc42e",
"-gcs-uri",
"gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1731,7 +1731,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1768,16 +1768,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_6/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1791,7 +1791,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1825,19 +1825,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"[CLEANUP]/tmp_tmp_6/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1851,7 +1851,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1875,7 +1875,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
},
{
"cmd": [
@@ -1890,16 +1890,16 @@
"[CLEANUP]/tmp_tmp_6/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1913,7 +1913,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1937,7 +1937,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -1950,18 +1950,18 @@
"--json-output",
"/path/to/tmp/json",
"file_hash",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar"
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1975,7 +1975,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2001,7 +2001,7 @@
},
"name": "Compute file hash (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@Hash calculated: 6689191ad27da9fce89670be7c2026d7c54c505dbf62803b64c538970cbc6169@@@"
+ "@@@STEP_TEXT@Hash calculated: 93867f34a1343c6d35618af5a4f2c9031538c2727486e59195585a1f4c8f3a78@@@"
]
},
{
@@ -2009,20 +2009,20 @@
"[START_DIR]/reporter/snoopy_broker",
"-report-gcs",
"-digest",
- "6689191ad27da9fce89670be7c2026d7c54c505dbf62803b64c538970cbc6169",
+ "93867f34a1343c6d35618af5a4f2c9031538c2727486e59195585a1f4c8f3a78",
"-gcs-uri",
"gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2036,7 +2036,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2073,16 +2073,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2096,7 +2096,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2130,19 +2130,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2156,7 +2156,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2180,7 +2180,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
},
{
"cmd": [
@@ -2195,16 +2195,16 @@
"[CLEANUP]/tmp_tmp_7/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2218,7 +2218,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2242,7 +2242,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -2255,18 +2255,18 @@
"--json-output",
"/path/to/tmp/json",
"file_hash",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom"
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2280,7 +2280,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2306,7 +2306,7 @@
},
"name": "Compute file hash (3)",
"~followup_annotations": [
- "@@@STEP_TEXT@Hash calculated: f266d3932d72969e719dbf778847d9e47408016bf74262830d3db2b447542fcf@@@"
+ "@@@STEP_TEXT@Hash calculated: 14261595b9f92b22f39814119b474bce259a0aa4bce63d9c6b32175f3e651a0f@@@"
]
},
{
@@ -2314,20 +2314,20 @@
"[START_DIR]/reporter/snoopy_broker",
"-report-gcs",
"-digest",
- "f266d3932d72969e719dbf778847d9e47408016bf74262830d3db2b447542fcf",
+ "14261595b9f92b22f39814119b474bce259a0aa4bce63d9c6b32175f3e651a0f",
"-gcs-uri",
"gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2341,7 +2341,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2373,16 +2373,16 @@
"-stage",
"upload-complete"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2396,7 +2396,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2429,19 +2429,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2455,7 +2455,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2481,8 +2481,8 @@
},
"name": "Expand directory (2)",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
@@ -2492,16 +2492,16 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2515,7 +2515,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2557,16 +2557,16 @@
"gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"[CLEANUP]/verify_tmp_1/artifacts.zip"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2580,7 +2580,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2621,16 +2621,16 @@
"gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip.intoto.jsonl",
"[CLEANUP]/verify_tmp_1/artifacts.zip.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2644,7 +2644,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2682,16 +2682,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2705,7 +2705,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2744,16 +2744,16 @@
"file_hash",
"[CLEANUP]/verify_tmp_1/artifacts.zip"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2767,7 +2767,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2808,16 +2808,16 @@
"[CLEANUP]/verify_tmp_1/artifacts.zip.intoto.jsonl",
"/path/to/tmp/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2831,7 +2831,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2872,16 +2872,16 @@
"Authorization: Bearer extra.secret.token.should.not.be.logged\n",
"[CLEANUP]/authorization"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2895,7 +2895,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2935,16 +2935,16 @@
"{\"resourceToVerify\": \"misc_software://flutter/engine\", \"artifactInfo\": {\"digests\": {\"sha256\": \"22e7401925ec25dd8c35fae6da25fdebcaa015f2b82f07f517814c9d7b7381f4\"}, \"attestations\": [\"\"]}}",
"[CLEANUP]/request"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2958,7 +2958,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3000,16 +3000,16 @@
"@[CLEANUP]/request",
"https://bcidsoftwareverifier-pa.googleapis.com/v1/software-artifact-verification-requests"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3023,7 +3023,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3068,16 +3068,16 @@
"remove",
"[CLEANUP]/authorization"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3091,7 +3091,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3130,16 +3130,16 @@
"remove",
"[CLEANUP]/request"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3153,7 +3153,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3193,16 +3193,16 @@
"This artifact is definitely legitimate!",
"[CLEANUP]/verify_tmp_1/artifacts.zip.vsa.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3216,7 +3216,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3259,16 +3259,16 @@
"[CLEANUP]/verify_tmp_1/artifacts.zip.vsa.intoto.jsonl",
"gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip.vsa.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3282,7 +3282,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3328,16 +3328,16 @@
"gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"[CLEANUP]/verify_tmp_2/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3351,7 +3351,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3392,16 +3392,16 @@
"gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar.intoto.jsonl",
"[CLEANUP]/verify_tmp_2/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3415,7 +3415,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3453,16 +3453,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3476,7 +3476,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3515,16 +3515,16 @@
"file_hash",
"[CLEANUP]/verify_tmp_2/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3538,7 +3538,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3579,16 +3579,16 @@
"[CLEANUP]/verify_tmp_2/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar.intoto.jsonl",
"/path/to/tmp/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3602,7 +3602,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3643,16 +3643,16 @@
"Authorization: Bearer extra.secret.token.should.not.be.logged\n",
"[CLEANUP]/authorization"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3666,7 +3666,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3706,16 +3706,16 @@
"{\"resourceToVerify\": \"misc_software://flutter/engine\", \"artifactInfo\": {\"digests\": {\"sha256\": \"fbfb5fc4b831f5dfa5c448eb386ba7a67d27063a8ddf1049d941c2d41cebb521\"}, \"attestations\": [\"\"]}}",
"[CLEANUP]/request"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3729,7 +3729,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3771,16 +3771,16 @@
"@[CLEANUP]/request",
"https://bcidsoftwareverifier-pa.googleapis.com/v1/software-artifact-verification-requests"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3794,7 +3794,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3839,16 +3839,16 @@
"remove",
"[CLEANUP]/authorization"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3862,7 +3862,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3901,16 +3901,16 @@
"remove",
"[CLEANUP]/request"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3924,7 +3924,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3964,16 +3964,16 @@
"This artifact is definitely legitimate!",
"[CLEANUP]/verify_tmp_2/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar.vsa.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3987,7 +3987,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4030,16 +4030,16 @@
"[CLEANUP]/verify_tmp_2/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar.vsa.intoto.jsonl",
"gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar.vsa.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4053,7 +4053,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4099,16 +4099,16 @@
"gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"[CLEANUP]/verify_tmp_3/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4122,7 +4122,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4163,16 +4163,16 @@
"gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom.intoto.jsonl",
"[CLEANUP]/verify_tmp_3/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4186,7 +4186,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4224,16 +4224,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4247,7 +4247,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4286,16 +4286,16 @@
"file_hash",
"[CLEANUP]/verify_tmp_3/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4309,7 +4309,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4350,16 +4350,16 @@
"[CLEANUP]/verify_tmp_3/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom.intoto.jsonl",
"/path/to/tmp/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4373,7 +4373,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4414,16 +4414,16 @@
"Authorization: Bearer extra.secret.token.should.not.be.logged\n",
"[CLEANUP]/authorization"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4437,7 +4437,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4477,16 +4477,16 @@
"{\"resourceToVerify\": \"misc_software://flutter/engine\", \"artifactInfo\": {\"digests\": {\"sha256\": \"0e74d4e6fa302710db412ee4ba196e3d39f10a4e06deb25cc92f00d6df8feebe\"}, \"attestations\": [\"\"]}}",
"[CLEANUP]/request"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4500,7 +4500,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4542,16 +4542,16 @@
"@[CLEANUP]/request",
"https://bcidsoftwareverifier-pa.googleapis.com/v1/software-artifact-verification-requests"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4565,7 +4565,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4610,16 +4610,16 @@
"remove",
"[CLEANUP]/authorization"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4633,7 +4633,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4672,16 +4672,16 @@
"remove",
"[CLEANUP]/request"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4695,7 +4695,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4735,16 +4735,16 @@
"This artifact is definitely legitimate!",
"[CLEANUP]/verify_tmp_3/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom.vsa.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4758,7 +4758,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4801,16 +4801,16 @@
"[CLEANUP]/verify_tmp_3/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom.vsa.intoto.jsonl",
"gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom.vsa.intoto.jsonl"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4824,7 +4824,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4862,7 +4862,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/mac_main.json b/recipes/engine_v2/builder.expected/mac_main.json
index 7d8e0a6..5f20ae9 100644
--- a/recipes/engine_v2/builder.expected/mac_main.json
+++ b/recipes/engine_v2/builder.expected/mac_main.json
@@ -110,7 +110,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -253,9 +253,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -263,21 +263,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/mac-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -298,7 +298,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -332,26 +332,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -362,8 +362,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -375,15 +375,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/mac-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -395,7 +395,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -509,14 +509,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -530,7 +530,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -592,14 +592,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -623,7 +623,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -666,14 +666,14 @@
"[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -697,7 +697,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -732,14 +732,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -763,7 +763,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -802,14 +802,14 @@
"restart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -833,7 +833,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -857,20 +857,20 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/tools/gn",
+ "[CACHE]/builder/engine/src/flutter/tools/gn",
"--ios",
"--rbe",
"--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -887,7 +887,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -924,14 +924,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -955,7 +955,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -987,14 +987,14 @@
"stat"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1018,7 +1018,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1046,14 +1046,14 @@
"stop"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1077,7 +1077,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1110,14 +1110,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1133,7 +1133,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1168,14 +1168,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1191,7 +1191,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1247,14 +1247,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1270,7 +1270,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1313,14 +1313,14 @@
"[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1336,7 +1336,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1371,14 +1371,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1394,7 +1394,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1433,14 +1433,14 @@
"{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"mac-host\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1456,7 +1456,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1488,14 +1488,14 @@
"restart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1519,7 +1519,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1542,21 +1542,21 @@
},
{
"cmd": [
- "[CACHE]/third_party/ninja/ninja",
+ "[CACHE]/builder/third_party/ninja/ninja",
"-j",
"200",
"-C",
- "[CACHE]/builder/src/out/ios_debug"
+ "[CACHE]/builder/engine/src/out/ios_debug"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1572,7 +1572,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1609,14 +1609,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1640,7 +1640,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1672,14 +1672,14 @@
"stat"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1703,7 +1703,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1731,14 +1731,14 @@
"stop"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1762,7 +1762,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1795,14 +1795,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1818,7 +1818,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1853,14 +1853,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1876,7 +1876,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1913,14 +1913,14 @@
"{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"mac-host\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1936,7 +1936,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1963,16 +1963,16 @@
"pub",
"get"
],
- "cwd": "[CACHE]/builder/src",
+ "cwd": "[CACHE]/builder/engine/src",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1986,8 +1986,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2014,20 +2014,20 @@
},
{
"cmd": [
- "[CACHE]/builder/src/script1.sh",
- "[CACHE]/builder/src/dev/felt.dart",
+ "[CACHE]/builder/engine/src/script1.sh",
+ "[CACHE]/builder/engine/src/dev/felt.dart",
"--argument1"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2041,7 +2041,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2075,16 +2075,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2098,7 +2098,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2135,16 +2135,16 @@
"extra.secret.token.should.not.be.logged",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2158,7 +2158,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2200,16 +2200,16 @@
"0o777",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2223,7 +2223,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2263,16 +2263,16 @@
"",
"[CLEANUP]/flutter_logs_dir/noop.txt"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2286,7 +2286,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2317,21 +2317,21 @@
},
{
"cmd": [
- "[CACHE]/builder/src/myscript.sh",
+ "[CACHE]/builder/engine/src/myscript.sh",
"param1",
"param2",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GCP_PROJECT": "flutter-infra-staging",
@@ -2347,8 +2347,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2392,16 +2392,16 @@
"[CLEANUP]/flutter_logs_dir",
"gs://flutter_logs/flutter/abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd/mytest/00000000-0000-0000-0000-000000001337"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2415,7 +2415,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2456,16 +2456,16 @@
"[CLEANUP]/flutter_logs_dir",
"*"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2479,7 +2479,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2528,16 +2528,16 @@
"[CLEANUP]/flutter_logs_dir",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2551,7 +2551,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2592,16 +2592,16 @@
"remove",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2615,7 +2615,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2649,19 +2649,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2675,7 +2675,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2701,8 +2701,8 @@
},
"name": "Expand directory",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
@@ -2712,16 +2712,16 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2735,7 +2735,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2773,16 +2773,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_5/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2796,7 +2796,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2830,19 +2830,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
"[CLEANUP]/tmp_tmp_5/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2856,7 +2856,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2880,7 +2880,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
},
{
"cmd": [
@@ -2895,16 +2895,16 @@
"[CLEANUP]/tmp_tmp_5/*",
"gs://flutter_infra_release/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2918,7 +2918,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2942,7 +2942,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
]
@@ -2959,16 +2959,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_6/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2982,7 +2982,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3016,19 +3016,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"[CLEANUP]/tmp_tmp_6/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3042,7 +3042,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3066,7 +3066,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
},
{
"cmd": [
@@ -3081,16 +3081,16 @@
"[CLEANUP]/tmp_tmp_6/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3104,7 +3104,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3128,7 +3128,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -3145,16 +3145,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3168,7 +3168,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3202,19 +3202,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3228,7 +3228,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3252,7 +3252,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
},
{
"cmd": [
@@ -3267,16 +3267,16 @@
"[CLEANUP]/tmp_tmp_7/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3290,7 +3290,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3314,7 +3314,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -3327,7 +3327,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/mac_release_candidate.json b/recipes/engine_v2/builder.expected/mac_release_candidate.json
index adbb640..80ff1b1 100644
--- a/recipes/engine_v2/builder.expected/mac_release_candidate.json
+++ b/recipes/engine_v2/builder.expected/mac_release_candidate.json
@@ -110,7 +110,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -253,9 +253,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -263,21 +263,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/flutter-3.17-candidate.0"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/mac-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -298,7 +298,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -332,26 +332,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -362,8 +362,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -375,15 +375,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/mac-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -395,7 +395,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -509,14 +509,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -530,7 +530,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -592,14 +592,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -623,7 +623,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -666,14 +666,14 @@
"[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -697,7 +697,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -732,14 +732,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -763,7 +763,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -802,14 +802,14 @@
"restart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -833,7 +833,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -857,20 +857,20 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/tools/gn",
+ "[CACHE]/builder/engine/src/flutter/tools/gn",
"--ios",
"--rbe",
"--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -887,7 +887,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -924,14 +924,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -955,7 +955,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -987,14 +987,14 @@
"stat"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1018,7 +1018,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1046,14 +1046,14 @@
"stop"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1077,7 +1077,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1110,14 +1110,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1133,7 +1133,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1168,14 +1168,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1191,7 +1191,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1247,14 +1247,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1270,7 +1270,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1313,14 +1313,14 @@
"[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1336,7 +1336,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1371,14 +1371,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1394,7 +1394,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1433,14 +1433,14 @@
"{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"mac-host\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1456,7 +1456,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1488,14 +1488,14 @@
"restart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1519,7 +1519,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1542,21 +1542,21 @@
},
{
"cmd": [
- "[CACHE]/third_party/ninja/ninja",
+ "[CACHE]/builder/third_party/ninja/ninja",
"-j",
"200",
"-C",
- "[CACHE]/builder/src/out/ios_debug"
+ "[CACHE]/builder/engine/src/out/ios_debug"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1572,7 +1572,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1609,14 +1609,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1640,7 +1640,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1672,14 +1672,14 @@
"stat"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1703,7 +1703,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1731,14 +1731,14 @@
"stop"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1762,7 +1762,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1795,14 +1795,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1818,7 +1818,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1853,14 +1853,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1876,7 +1876,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1913,14 +1913,14 @@
"{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"mac-host\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1936,7 +1936,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1963,16 +1963,16 @@
"pub",
"get"
],
- "cwd": "[CACHE]/builder/src",
+ "cwd": "[CACHE]/builder/engine/src",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1986,8 +1986,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2014,20 +2014,20 @@
},
{
"cmd": [
- "[CACHE]/builder/src/script1.sh",
- "[CACHE]/builder/src/dev/felt.dart",
+ "[CACHE]/builder/engine/src/script1.sh",
+ "[CACHE]/builder/engine/src/dev/felt.dart",
"--argument1"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2041,7 +2041,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2075,16 +2075,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2098,7 +2098,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2135,16 +2135,16 @@
"extra.secret.token.should.not.be.logged",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2158,7 +2158,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2200,16 +2200,16 @@
"0o777",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2223,7 +2223,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2263,16 +2263,16 @@
"",
"[CLEANUP]/flutter_logs_dir/noop.txt"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2286,7 +2286,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2317,21 +2317,21 @@
},
{
"cmd": [
- "[CACHE]/builder/src/myscript.sh",
+ "[CACHE]/builder/engine/src/myscript.sh",
"param1",
"param2",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GCP_PROJECT": "flutter-infra-staging",
@@ -2347,8 +2347,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2392,16 +2392,16 @@
"[CLEANUP]/flutter_logs_dir",
"gs://flutter_logs/flutter/abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd/mytest/00000000-0000-0000-0000-000000001337"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2415,7 +2415,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2456,16 +2456,16 @@
"[CLEANUP]/flutter_logs_dir",
"*"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2479,7 +2479,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2528,16 +2528,16 @@
"[CLEANUP]/flutter_logs_dir",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2551,7 +2551,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2592,16 +2592,16 @@
"remove",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2615,7 +2615,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2649,19 +2649,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2675,7 +2675,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2701,8 +2701,8 @@
},
"name": "Expand directory",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
@@ -2712,16 +2712,16 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2735,7 +2735,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2767,16 +2767,16 @@
"rev-parse",
"remotes/origin/flutter-3.17-candidate.0"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2790,7 +2790,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2822,16 +2822,16 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2845,7 +2845,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2876,16 +2876,16 @@
"python3",
"RECIPE_MODULE[flutter::zip]/resources/namelist.py"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2899,7 +2899,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2923,7 +2923,7 @@
}
},
"name": "namelist",
- "stdin": "{\"zip_file\": \"[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip\"}",
+ "stdin": "{\"zip_file\": \"[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip\"}",
"~followup_annotations": [
"@@@STEP_LOG_END@json.output (invalid)@@@",
"@@@STEP_LOG_LINE@json.output (exception)@Expecting value: line 1 column 1 (char 0)@@@",
@@ -2935,16 +2935,16 @@
"python3",
"RECIPE_MODULE[flutter::zip]/resources/namelist.py"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2958,7 +2958,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2982,7 +2982,7 @@
}
},
"name": "namelist (2)",
- "stdin": "{\"zip_file\": \"[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar\"}",
+ "stdin": "{\"zip_file\": \"[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar\"}",
"~followup_annotations": [
"@@@STEP_LOG_END@json.output (invalid)@@@",
"@@@STEP_LOG_LINE@json.output (exception)@Expecting value: line 1 column 1 (char 0)@@@",
@@ -2994,16 +2994,16 @@
"python3",
"RECIPE_MODULE[flutter::zip]/resources/namelist.py"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3017,7 +3017,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3041,7 +3041,7 @@
}
},
"name": "namelist (3)",
- "stdin": "{\"zip_file\": \"[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom\"}",
+ "stdin": "{\"zip_file\": \"[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom\"}",
"~followup_annotations": [
"@@@STEP_LOG_END@json.output (invalid)@@@",
"@@@STEP_LOG_LINE@json.output (exception)@Expecting value: line 1 column 1 (char 0)@@@",
@@ -3072,16 +3072,16 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3095,7 +3095,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3152,16 +3152,16 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3175,7 +3175,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3227,16 +3227,16 @@
"gs://flutter_configs/exported_p12.encrypted",
"[CLEANUP]/exported_p12.encrypted"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3250,7 +3250,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3289,16 +3289,16 @@
"[CLEANUP]/FLUTTER_P12",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3312,7 +3312,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3353,16 +3353,16 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3376,7 +3376,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3428,16 +3428,16 @@
"gs://flutter_configs/0325_p12password.encrypted",
"[CLEANUP]/0325_p12password.encrypted"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3451,7 +3451,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3490,16 +3490,16 @@
"[CLEANUP]/FLUTTER_P12_PASSWORD",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3513,7 +3513,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3554,16 +3554,16 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3577,7 +3577,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3629,16 +3629,16 @@
"gs://flutter_configs/codesign_team_id.encrypted",
"[CLEANUP]/codesign_team_id.encrypted"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3652,7 +3652,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3691,16 +3691,16 @@
"[CLEANUP]/CODESIGN_TEAM_ID",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3714,7 +3714,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3755,16 +3755,16 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3778,7 +3778,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3830,16 +3830,16 @@
"gs://flutter_configs/codesign_app_specific_password.encrypted",
"[CLEANUP]/codesign_app_specific_password.encrypted"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3853,7 +3853,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3892,16 +3892,16 @@
"[CLEANUP]/CODESIGN_APP_SPECIFIC_PASSWORD",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3915,7 +3915,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3956,16 +3956,16 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3979,7 +3979,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4031,16 +4031,16 @@
"gs://flutter_configs/codesign_app_store_id.encrypted",
"[CLEANUP]/codesign_app_store_id.encrypted"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4054,7 +4054,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4093,16 +4093,16 @@
"[CLEANUP]/CODESIGN_APP_STORE_ID",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4116,7 +4116,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4154,16 +4154,16 @@
"755",
"RECIPE_MODULE[flutter::signing]/resources/setup_keychain.dart"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4177,7 +4177,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4210,9 +4210,9 @@
"cmd": [
"RECIPE_MODULE[flutter::signing]/resources/setup_keychain.dart"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
@@ -4222,8 +4222,8 @@
"CODESIGN_PATH": "[CLEANUP]/tmp_tmp_5/codesign",
"CODESIGN_TEAM_ID": "[CLEANUP]/CODESIGN_TEAM_ID",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_P12": "[CLEANUP]/FLUTTER_P12",
"FLUTTER_P12_PASSWORD": "[CLEANUP]/FLUTTER_P12_PASSWORD",
@@ -4241,7 +4241,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4279,9 +4279,9 @@
"[CLEANUP]/setup_keychain_logs.txt",
"gs://flutter_tmp_logs/8945511751514863184/setup_keychain_logs_00000000-0000-0000-0000-00000000133a.txt"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
@@ -4291,8 +4291,8 @@
"CODESIGN_PATH": "[CLEANUP]/tmp_tmp_5/codesign",
"CODESIGN_TEAM_ID": "[CLEANUP]/CODESIGN_TEAM_ID",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_P12": "[CLEANUP]/FLUTTER_P12",
"FLUTTER_P12_PASSWORD": "[CLEANUP]/FLUTTER_P12_PASSWORD",
@@ -4310,7 +4310,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4349,16 +4349,16 @@
"delete-keychain",
"build.keychain"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4372,7 +4372,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4407,16 +4407,16 @@
"-s",
"login.keychain"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4430,7 +4430,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4470,16 +4470,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_6/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4493,7 +4493,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4527,19 +4527,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
"[CLEANUP]/tmp_tmp_6/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4553,7 +4553,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4577,7 +4577,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
},
{
"cmd": [
@@ -4592,16 +4592,16 @@
"[CLEANUP]/tmp_tmp_6/*",
"gs://flutter_infra_release/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4615,7 +4615,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4639,7 +4639,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
]
@@ -4656,16 +4656,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4679,7 +4679,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4713,19 +4713,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4739,7 +4739,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4763,7 +4763,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
},
{
"cmd": [
@@ -4778,16 +4778,16 @@
"[CLEANUP]/tmp_tmp_7/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4801,7 +4801,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4825,7 +4825,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -4842,16 +4842,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_8/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4865,7 +4865,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4899,19 +4899,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"[CLEANUP]/tmp_tmp_8/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4925,7 +4925,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -4949,7 +4949,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
},
{
"cmd": [
@@ -4964,16 +4964,16 @@
"[CLEANUP]/tmp_tmp_8/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -4987,7 +4987,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -5011,7 +5011,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -5024,7 +5024,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/test_if_not_skip_postsubmit.json b/recipes/engine_v2/builder.expected/test_if_not_skip_postsubmit.json
index 713caf9..737b548 100644
--- a/recipes/engine_v2/builder.expected/test_if_not_skip_postsubmit.json
+++ b/recipes/engine_v2/builder.expected/test_if_not_skip_postsubmit.json
@@ -31,7 +31,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -174,9 +174,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -184,21 +184,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -219,7 +219,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -253,26 +253,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -283,8 +283,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -296,15 +296,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -316,7 +316,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -417,16 +417,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -440,7 +440,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -477,16 +477,16 @@
"extra.secret.token.should.not.be.logged",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -500,7 +500,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -542,16 +542,16 @@
"0o777",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -565,7 +565,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -605,16 +605,16 @@
"",
"[CLEANUP]/flutter_logs_dir/noop.txt"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -628,7 +628,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -659,21 +659,21 @@
},
{
"cmd": [
- "[CACHE]/builder/src/myscript.sh",
+ "[CACHE]/builder/engine/src/myscript.sh",
"param1",
"param2",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GCP_PROJECT": "flutter-infra-staging",
@@ -689,8 +689,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -734,16 +734,16 @@
"[CLEANUP]/flutter_logs_dir",
"gs://flutter_logs/flutter/abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd/mytest/00000000-0000-0000-0000-000000001337"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -757,7 +757,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -798,16 +798,16 @@
"[CLEANUP]/flutter_logs_dir",
"*"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -821,7 +821,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -870,16 +870,16 @@
"[CLEANUP]/flutter_logs_dir",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -893,7 +893,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -934,16 +934,16 @@
"remove",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -957,7 +957,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -991,7 +991,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/test_if_not_skip_presubmit.json b/recipes/engine_v2/builder.expected/test_if_not_skip_presubmit.json
index 6d6e856..9ea74d3 100644
--- a/recipes/engine_v2/builder.expected/test_if_not_skip_presubmit.json
+++ b/recipes/engine_v2/builder.expected/test_if_not_skip_presubmit.json
@@ -31,7 +31,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -174,9 +174,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -184,21 +184,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "main",
"GIT_DAPPER_TRACE": "1",
@@ -219,7 +219,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -253,26 +253,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -283,8 +283,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -296,15 +296,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "main",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -316,7 +316,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -417,16 +417,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "main",
@@ -440,7 +440,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -477,16 +477,16 @@
"extra.secret.token.should.not.be.logged",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "main",
@@ -500,7 +500,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -542,16 +542,16 @@
"0o777",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "main",
@@ -565,7 +565,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -605,16 +605,16 @@
"",
"[CLEANUP]/flutter_logs_dir/noop.txt"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "main",
@@ -628,7 +628,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -659,21 +659,21 @@
},
{
"cmd": [
- "[CACHE]/builder/src/myscript.sh",
+ "[CACHE]/builder/engine/src/myscript.sh",
"param1",
"param2",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GCP_PROJECT": "flutter-infra-staging",
@@ -689,8 +689,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -734,16 +734,16 @@
"[CLEANUP]/flutter_logs_dir",
"gs://flutter_logs/flutter/abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd/mytest/00000000-0000-0000-0000-000000001337"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "main",
@@ -757,7 +757,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -798,16 +798,16 @@
"[CLEANUP]/flutter_logs_dir",
"*"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "main",
@@ -821,7 +821,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -870,16 +870,16 @@
"[CLEANUP]/flutter_logs_dir",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "main",
@@ -893,7 +893,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -934,16 +934,16 @@
"remove",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "main",
@@ -957,7 +957,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -991,7 +991,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/test_if_skip_postsubmit.json b/recipes/engine_v2/builder.expected/test_if_skip_postsubmit.json
index a1150da..a3e96cc 100644
--- a/recipes/engine_v2/builder.expected/test_if_skip_postsubmit.json
+++ b/recipes/engine_v2/builder.expected/test_if_skip_postsubmit.json
@@ -31,7 +31,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -174,9 +174,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -184,21 +184,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/flutter-3.17-candidate.0"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -219,7 +219,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -253,26 +253,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -283,8 +283,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -296,15 +296,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -316,7 +316,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -416,7 +416,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/test_if_skip_presubmit.json b/recipes/engine_v2/builder.expected/test_if_skip_presubmit.json
index c6aee53..b283485 100644
--- a/recipes/engine_v2/builder.expected/test_if_skip_presubmit.json
+++ b/recipes/engine_v2/builder.expected/test_if_skip_presubmit.json
@@ -31,7 +31,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -174,9 +174,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -184,21 +184,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "flutter-3.17-candidate.0",
"GIT_DAPPER_TRACE": "1",
@@ -219,7 +219,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -253,26 +253,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -283,8 +283,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -296,15 +296,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/linux-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "flutter-3.17-candidate.0",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -316,7 +316,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -416,7 +416,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.expected/upload_logs.json b/recipes/engine_v2/builder.expected/upload_logs.json
index 8d3114a..625f5a9 100644
--- a/recipes/engine_v2/builder.expected/upload_logs.json
+++ b/recipes/engine_v2/builder.expected/upload_logs.json
@@ -110,7 +110,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -253,9 +253,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -263,21 +263,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
+ ".@abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/mac-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -298,7 +298,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -332,26 +332,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -362,8 +362,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -375,15 +375,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/mac-host/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -395,7 +395,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -509,14 +509,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -530,7 +530,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -592,14 +592,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -623,7 +623,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -666,14 +666,14 @@
"[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -697,7 +697,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -732,14 +732,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -763,7 +763,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -802,14 +802,14 @@
"restart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -833,7 +833,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -857,20 +857,20 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/tools/gn",
+ "[CACHE]/builder/engine/src/flutter/tools/gn",
"--ios",
"--rbe",
"--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -887,7 +887,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -924,14 +924,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -955,7 +955,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -987,14 +987,14 @@
"stat"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1018,7 +1018,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1046,14 +1046,14 @@
"stop"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1077,7 +1077,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1110,14 +1110,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1133,7 +1133,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1168,14 +1168,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1191,7 +1191,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1247,14 +1247,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1270,7 +1270,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1313,14 +1313,14 @@
"[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1336,7 +1336,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1371,14 +1371,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1394,7 +1394,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1433,14 +1433,14 @@
"{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"mac-host\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1456,7 +1456,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1488,14 +1488,14 @@
"restart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1519,7 +1519,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1542,21 +1542,21 @@
},
{
"cmd": [
- "[CACHE]/third_party/ninja/ninja",
+ "[CACHE]/builder/third_party/ninja/ninja",
"-j",
"200",
"-C",
- "[CACHE]/builder/src/out/ios_debug"
+ "[CACHE]/builder/engine/src/out/ios_debug"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1572,7 +1572,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1609,14 +1609,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1640,7 +1640,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1672,14 +1672,14 @@
"stat"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1703,7 +1703,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1731,14 +1731,14 @@
"stop"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1762,7 +1762,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1795,14 +1795,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1818,7 +1818,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1853,14 +1853,14 @@
"/path/to/tmp/"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1876,7 +1876,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1913,14 +1913,14 @@
"{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"mac-host\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1936,7 +1936,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1963,16 +1963,16 @@
"pub",
"get"
],
- "cwd": "[CACHE]/builder/src",
+ "cwd": "[CACHE]/builder/engine/src",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -1986,8 +1986,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2014,20 +2014,20 @@
},
{
"cmd": [
- "[CACHE]/builder/src/script1.sh",
- "[CACHE]/builder/src/dev/felt.dart",
+ "[CACHE]/builder/engine/src/script1.sh",
+ "[CACHE]/builder/engine/src/dev/felt.dart",
"--argument1"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2041,7 +2041,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2075,16 +2075,16 @@
"-lifetime",
"3m"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2098,7 +2098,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2135,16 +2135,16 @@
"extra.secret.token.should.not.be.logged",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2158,7 +2158,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2200,16 +2200,16 @@
"0o777",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2223,7 +2223,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2263,16 +2263,16 @@
"",
"[CLEANUP]/flutter_logs_dir/noop.txt"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2286,7 +2286,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2317,21 +2317,21 @@
},
{
"cmd": [
- "[CACHE]/builder/src/myscript.sh",
+ "[CACHE]/builder/engine/src/myscript.sh",
"param1",
"param2",
"[CLEANUP]/flutter_logs_dir"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GCP_PROJECT": "flutter-infra-staging",
@@ -2347,8 +2347,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2392,16 +2392,16 @@
"[CLEANUP]/flutter_logs_dir",
"gs://flutter_logs/flutter/abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd/test_arm64/uuid-1234"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2415,7 +2415,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2456,16 +2456,16 @@
"[CLEANUP]/flutter_logs_dir",
"*"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2479,7 +2479,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2528,16 +2528,16 @@
"[CLEANUP]/flutter_logs_dir",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2551,7 +2551,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2592,16 +2592,16 @@
"remove",
"[CLEANUP]/tmp_tmp_4"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2615,7 +2615,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2649,19 +2649,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
"--recursive"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2675,7 +2675,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2701,8 +2701,8 @@
},
"name": "Expand directory",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
- "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar@@@",
+ "@@@STEP_LOG_LINE@listdir@[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
@@ -2712,16 +2712,16 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2735,7 +2735,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2773,16 +2773,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_5/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2796,7 +2796,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2830,19 +2830,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
"[CLEANUP]/tmp_tmp_5/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2856,7 +2856,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2880,7 +2880,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to tmp location"
},
{
"cmd": [
@@ -2895,16 +2895,16 @@
"[CLEANUP]/tmp_tmp_5/*",
"gs://flutter_infra_release/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2918,7 +2918,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -2942,7 +2942,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
]
@@ -2959,16 +2959,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_6/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -2982,7 +2982,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3016,19 +3016,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"[CLEANUP]/tmp_tmp_6/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3042,7 +3042,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3066,7 +3066,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to tmp location"
},
{
"cmd": [
@@ -3081,16 +3081,16 @@
"[CLEANUP]/tmp_tmp_6/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3104,7 +3104,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3128,7 +3128,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -3145,16 +3145,16 @@
"0o777",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3168,7 +3168,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3202,19 +3202,19 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"[CLEANUP]/tmp_tmp_7/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3228,7 +3228,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3252,7 +3252,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
+ "name": "Copy [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to tmp location"
},
{
"cmd": [
@@ -3267,16 +3267,16 @@
"[CLEANUP]/tmp_tmp_7/*",
"gs://download.flutter.io/"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
"GIT_BRANCH": "",
@@ -3290,7 +3290,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -3314,7 +3314,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
+ "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
]
@@ -3327,7 +3327,7 @@
"--json-output",
"/path/to/tmp/json",
"copytree",
- "[CACHE]/builder/src/out/flutter/build",
+ "[CACHE]/builder/engine/src/out/flutter/build",
"[CLEANUP]/out-cas-directory_tmp_1/flutter/build"
],
"infra_step": true,
diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py
index 294cfd8..e0d6678 100644
--- a/recipes/engine_v2/builder.py
+++ b/recipes/engine_v2/builder.py
@@ -25,6 +25,7 @@
}
}
"""
+
import contextlib
import copy
import re
@@ -78,7 +79,6 @@
# Default timeout for tests running as part of the build.
DEFAULT_TEST_TIMEOUT_SECS = 30 * 60
-
def run_generators(api, pub_dirs, generator_tasks, checkout, env, env_prefixes):
"""Runs sub-builds generators."""
# Run pub on all of the pub_dirs.
@@ -186,7 +186,7 @@
# of files.
api.path.mock_add_directory(
api.path.cache_dir /
- 'builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io'
+ 'builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io'
)
ninja_tool = {
@@ -241,8 +241,9 @@
api.flutter_bcid.report_stage('upload-complete')
# Allow time for the provenance to upload so it can be validated
api.time.sleep(60)
- for archive_config in archives:
- if api.flutter_bcid.is_official_build():
+ if api.flutter_bcid.is_official_build():
+ assert archives, 'no archives, wtf? %s' % build
+ for archive_config in archives:
Verify(api, checkout, archive_config)
# Archive full build. This is inefficient but necessary for global generators.
if build.get('cas_archive', True):
@@ -296,12 +297,10 @@
api.flutter_bcid.report_stage('start')
- if api.repo_util.is_fusion():
- checkout = api.path.cache_dir / 'builder/engine/src'
- elif api.monorepo.is_monorepo_ci_build or api.monorepo.is_monorepo_try_build:
+ if api.monorepo.is_monorepo_ci_build or api.monorepo.is_monorepo_try_build:
checkout = api.path.cache_dir / 'builder/flutter/engine/src'
else:
- checkout = api.path.cache_dir / 'builder/src'
+ checkout = api.path.cache_dir / 'builder/engine/src'
api.file.rmtree('Clobber build output', checkout / 'out')
cache_root = api.path.cache_dir / 'builder'
@@ -384,12 +383,15 @@
}
yield api.test(
'basic',
- api.properties(build=build, no_goma=True),
+ api.properties(
+ build=build,
+ no_goma=True,
+ ),
api.buildbucket.ci_build(
project='flutter',
bucket='prod',
builder='linux-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/main',
revision='abcd' * 10,
build_number=123,
@@ -397,12 +399,15 @@
)
yield api.test(
'config_file',
- api.properties(no_goma=True, config_name='abc'),
+ api.properties(
+ no_goma=True,
+ config_name='abc',
+ ),
api.buildbucket.ci_build(
project='flutter',
bucket='prod',
builder='linux-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/main',
revision='abcd' * 10,
build_number=123,
@@ -410,13 +415,16 @@
)
yield api.test(
'mac_main',
- api.properties(build=build, no_goma=True),
+ api.properties(
+ build=build,
+ no_goma=True,
+ ),
api.platform('mac', 64),
api.buildbucket.ci_build(
project='flutter',
bucket='prod',
builder='mac-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/main',
revision='abcd' * 10,
build_number=123,
@@ -424,32 +432,22 @@
)
yield api.test(
'mac_release_candidate',
- api.properties(build=build, no_goma=True),
+ api.properties(
+ build=build,
+ no_goma=True,
+ ),
api.platform('mac', 64),
api.buildbucket.ci_build(
project='flutter',
bucket='prod',
builder='mac-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/flutter-3.17-candidate.0',
revision='abcd' * 10,
build_number=123,
),
)
yield api.test(
- 'basic_fusion',
- api.properties(builds=[build], no_goma=True, is_fusion=True),
- api.buildbucket.ci_build(
- project='flutter',
- bucket='prod',
- builder='prod-builder',
- git_repo='https://flutter.googlesource.com/mirrors/flutter',
- git_ref='refs/heads/main',
- revision='a' * 40,
- build_number=123,
- ),
- )
- yield api.test(
'monorepo',
api.properties(build=build, no_goma=True),
api.monorepo.ci_build(),
@@ -476,11 +474,14 @@
pom_location = 'x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
yield api.test(
'dart-internal-flutter-success',
- api.properties(build=build, no_goma=True),
+ api.properties(
+ build=build,
+ no_goma=True,
+ ),
api.buildbucket.ci_build(
project='dart-internal',
bucket='flutter',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/main',
),
api.step_data(
@@ -511,12 +512,15 @@
}
yield api.test(
'test_if_skip_postsubmit',
- api.properties(build=test_if_build, no_goma=True),
+ api.properties(
+ build=test_if_build,
+ no_goma=True,
+ ),
api.buildbucket.ci_build(
project='flutter',
bucket='prod',
builder='linux-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/flutter-3.17-candidate.0',
revision='abcd' * 10,
build_number=123,
@@ -524,12 +528,15 @@
)
yield api.test(
'test_if_not_skip_postsubmit',
- api.properties(build=test_if_build, no_goma=True),
+ api.properties(
+ build=test_if_build,
+ no_goma=True,
+ ),
api.buildbucket.ci_build(
project='flutter',
bucket='prod',
builder='linux-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/main',
revision='abcd' * 10,
build_number=123,
@@ -547,7 +554,7 @@
project='flutter',
bucket='prod',
builder='linux-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
revision='abcd' * 10,
build_number=123,
),
@@ -564,7 +571,7 @@
project='flutter',
bucket='prod',
builder='linux-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
revision='abcd' * 10,
build_number=123,
),
@@ -606,20 +613,23 @@
"type": "local",
"contexts": ["metric_center_token"],
"upload_logs": {
- "name": "test_arm64",
- "uuid": "uuid-1234"
+ "name": "test_arm64",
+ "uuid": "uuid-1234"
}
}]
}
yield api.test(
'upload_logs',
- api.properties(build=build, no_goma=True),
+ api.properties(
+ build=build,
+ no_goma=True,
+ ),
api.platform('mac', 64),
api.buildbucket.ci_build(
project='flutter',
bucket='prod',
builder='mac-host',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/main',
revision='abcd' * 10,
build_number=123,
diff --git a/recipes/engine_v2/cache.expected/basic.json b/recipes/engine_v2/cache.expected/basic.json
index 361207e..9d31be4 100644
--- a/recipes/engine_v2/cache.expected/basic.json
+++ b/recipes/engine_v2/cache.expected/basic.json
@@ -104,9 +104,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -114,18 +114,18 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@HEAD"
+ ".@HEAD"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
@@ -147,7 +147,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -169,27 +169,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"HEAD\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"9221bca00ddbd888260084def81f09543281b952\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -198,9 +198,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -212,13 +212,13 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -231,7 +231,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_linux.json b/recipes/engine_v2/engine_v2.expected/basic_linux.json
index e083a0f..a7cb761 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_linux.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_linux.json
@@ -32,7 +32,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -78,13 +78,13 @@
"@@@STEP_LOG_LINE@request@ \"change\": \"123456\",@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"flutter-review.googlesource.com\",@@@",
"@@@STEP_LOG_LINE@request@ \"patchset\": \"7\",@@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/flutter\"@@@",
"@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"flutter.googlesource.com\",@@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/flutter\",@@@",
"@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30,@@@",
@@ -431,14 +431,14 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -451,7 +451,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -502,11 +502,11 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--patch_root",
- "src/flutter",
+ ".",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -514,9 +514,9 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
- "https://flutter.googlesource.com/mirrors/engine@refs/heads/main:refs/changes/56/123456/7",
+ "https://flutter.googlesource.com/mirrors/flutter@refs/heads/main:refs/changes/56/123456/7",
"--revision",
- "src/flutter@refs/heads/main",
+ ".@refs/heads/main",
"--refs",
"refs/heads/main",
"--refs",
@@ -524,15 +524,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -553,7 +553,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -587,27 +587,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/heads/main\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"e1f32bac24d72ebe0a5713009ae850c6320e7c7d\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"4206feabaa013b8825cf4dd0b97a4ef5b605280b\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"e1f32bac24d72ebe0a5713009ae850c6320e7c7d\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"4206feabaa013b8825cf4dd0b97a4ef5b605280b\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"e1f32bac24d72ebe0a5713009ae850c6320e7c7d\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"4206feabaa013b8825cf4dd0b97a4ef5b605280b\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -616,9 +616,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"e1f32bac24d72ebe0a5713009ae850c6320e7c7d\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"4206feabaa013b8825cf4dd0b97a4ef5b605280b\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -630,15 +630,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -650,7 +650,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -687,7 +687,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -712,7 +712,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -741,19 +741,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out",
+ "[CACHE]/builder/engine/src/out",
"--recursive"
],
- "cwd": "[CACHE]/builder",
+ "cwd": "[CACHE]/builder/engine",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -765,7 +765,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -798,23 +798,23 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/sky/tools/create_macos_framework.py",
+ "[CACHE]/builder/engine/src/flutter/sky/tools/create_macos_framework.py",
"--variant",
"host_profile",
"--type",
"engine",
"--engine-capture-core-dump"
],
- "cwd": "[CACHE]/builder",
+ "cwd": "[CACHE]/builder/engine",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -826,8 +826,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index a92337f..8fb2a99 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -51,7 +51,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -95,7 +95,7 @@
"@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"flutter.googlesource.com\",@@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/flutter\",@@@",
"@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30,@@@",
@@ -430,9 +430,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -440,21 +440,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+ ".@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/prod-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -475,7 +475,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -509,26 +509,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -539,8 +539,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -552,15 +552,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "flutter/prod/prod-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -572,7 +572,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -655,7 +655,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -691,19 +691,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out",
+ "[CACHE]/builder/engine/src/out",
"--recursive"
],
- "cwd": "[CACHE]/builder",
+ "cwd": "[CACHE]/builder/engine",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -715,7 +715,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -748,23 +748,23 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/sky/tools/create_macos_framework.py",
+ "[CACHE]/builder/engine/src/flutter/sky/tools/create_macos_framework.py",
"--variant",
"host_profile",
"--type",
"engine",
"--engine-capture-core-dump"
],
- "cwd": "[CACHE]/builder",
+ "cwd": "[CACHE]/builder/engine",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -776,8 +776,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -811,7 +811,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -848,7 +848,7 @@
}
},
"name": "Global generators.namelist",
- "stdin": "{\"zip_file\": \"[CACHE]/builder/src/a/b/c.txt\"}",
+ "stdin": "{\"zip_file\": \"[CACHE]/builder/engine/src/a/b/c.txt\"}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@",
@@ -894,7 +894,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/a/b/c.txt",
+ "[CACHE]/builder/engine/src/a/b/c.txt",
"[CLEANUP]/tmp_tmp_3/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
],
"infra_step": true,
@@ -910,7 +910,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Copy [CACHE]/builder/src/a/b/c.txt to tmp location",
+ "name": "Global generators.Copy [CACHE]/builder/engine/src/a/b/c.txt to tmp location",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -941,7 +941,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.gsutil Upload [CACHE]/builder/src/a/b/c.txt to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+ "name": "Global generators.gsutil Upload [CACHE]/builder/engine/src/a/b/c.txt to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
index 9ce9abd..d933bb0 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -117,7 +117,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"flutter\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"dart-internal\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"flutter\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"dart-internal\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -161,7 +161,7 @@
"@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"flutter.googlesource.com\",@@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/flutter\",@@@",
"@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30,@@@",
@@ -460,9 +460,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'release_candidate': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -470,21 +470,21 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+ ".@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"--refs",
"refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "dart-internal/flutter/prod-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -505,7 +505,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -539,26 +539,26 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -569,8 +569,8 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_engine_revision@\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -582,15 +582,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "dart-internal/flutter/prod-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -602,7 +602,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -639,7 +639,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -745,19 +745,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out",
+ "[CACHE]/builder/engine/src/out",
"--recursive"
],
- "cwd": "[CACHE]/builder",
+ "cwd": "[CACHE]/builder/engine",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -769,7 +769,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -802,23 +802,23 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/sky/tools/create_macos_framework.py",
+ "[CACHE]/builder/engine/src/flutter/sky/tools/create_macos_framework.py",
"--variant",
"host_profile",
"--type",
"engine",
"--engine-capture-core-dump"
],
- "cwd": "[CACHE]/builder",
+ "cwd": "[CACHE]/builder/engine",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -830,8 +830,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -889,7 +889,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -926,7 +926,7 @@
}
},
"name": "Global generators.namelist",
- "stdin": "{\"zip_file\": \"[CACHE]/builder/src/a/b/c.txt\"}",
+ "stdin": "{\"zip_file\": \"[CACHE]/builder/engine/src/a/b/c.txt\"}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@",
@@ -972,7 +972,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/a/b/c.txt",
+ "[CACHE]/builder/engine/src/a/b/c.txt",
"[CLEANUP]/tmp_tmp_3/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
],
"infra_step": true,
@@ -988,7 +988,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Copy [CACHE]/builder/src/a/b/c.txt to tmp location",
+ "name": "Global generators.Copy [CACHE]/builder/engine/src/a/b/c.txt to tmp location",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1019,7 +1019,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.gsutil Upload [CACHE]/builder/src/a/b/c.txt to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+ "name": "Global generators.gsutil Upload [CACHE]/builder/engine/src/a/b/c.txt to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
@@ -1033,7 +1033,7 @@
"--json-output",
"/path/to/tmp/json",
"file_hash",
- "[CACHE]/builder/src/a/b/c.txt"
+ "[CACHE]/builder/engine/src/a/b/c.txt"
],
"infra_step": true,
"luci_context": {
@@ -1051,7 +1051,7 @@
"name": "Global generators.Compute file hash",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Hash calculated: 21b19f47137ba277ec3f791c188884edc2af641f9d7efa45f2c8526ece03d08e@@@"
+ "@@@STEP_TEXT@Hash calculated: cf433c8dc1f2accb5ad5e27b50452bdd89b0759c538f29f65b3468d300bb4f9c@@@"
]
},
{
@@ -1059,7 +1059,7 @@
"[START_DIR]/reporter/snoopy_broker",
"-report-gcs",
"-digest",
- "21b19f47137ba277ec3f791c188884edc2af641f9d7efa45f2c8526ece03d08e",
+ "cf433c8dc1f2accb5ad5e27b50452bdd89b0759c538f29f65b3468d300bb4f9c",
"-gcs-uri",
"gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt"
],
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_fusion.json b/recipes/engine_v2/engine_v2.expected/basic_mac_fusion.json
index ec0eead..602bc03 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_fusion.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_fusion.json
@@ -275,7 +275,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -384,7 +384,6 @@
"@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ ]@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine_v2/builder\",@@@",
"@@@STEP_LOG_LINE@request@ \"tests\": []@@@",
diff --git a/recipes/engine_v2/engine_v2.expected/build_gclient_variables_override_input.json b/recipes/engine_v2/engine_v2.expected/build_gclient_variables_override_input.json
index de3fe80..9cf7ed6 100644
--- a/recipes/engine_v2/engine_v2.expected/build_gclient_variables_override_input.json
+++ b/recipes/engine_v2/engine_v2.expected/build_gclient_variables_override_input.json
@@ -201,7 +201,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/monorepo/ci/builders/config_name.json",
+ "[START_DIR]/monorepo/engine/src/flutter/ci/builders/config_name.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index 0d69ad4..9313c89 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -20,7 +20,7 @@
},
{
"cmd": [],
- "name": "Checkout flutter/engine"
+ "name": "Checkout flutter/flutter"
},
{
"cmd": [
@@ -28,9 +28,9 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[START_DIR]/engine",
+ "[START_DIR]/flutter",
"--url",
- "https://flutter.googlesource.com/mirrors/engine"
+ "https://flutter.googlesource.com/mirrors/flutter"
],
"luci_context": {
"realm": {
@@ -44,7 +44,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git setup",
+ "name": "Checkout flutter/flutter.git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -58,7 +58,7 @@
"--progress",
"--tags"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"env": {
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
@@ -75,7 +75,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git fetch",
+ "name": "Checkout flutter/flutter.git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -87,7 +87,7 @@
"-f",
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -101,7 +101,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git checkout",
+ "name": "Checkout flutter/flutter.git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -112,7 +112,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -126,7 +126,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.read revision",
+ "name": "Checkout flutter/flutter.read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -141,7 +141,7 @@
"-d",
"-x"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -155,7 +155,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git clean",
+ "name": "Checkout flutter/flutter.git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -166,7 +166,7 @@
"submodule",
"sync"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -180,7 +180,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.submodule sync",
+ "name": "Checkout flutter/flutter.submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -193,7 +193,7 @@
"--init",
"--recursive"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -207,7 +207,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.submodule update",
+ "name": "Checkout flutter/flutter.submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -220,7 +220,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/engine/ci/builders/config_name.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/config_name.json",
"/path/to/tmp/"
],
"infra_step": true,
@@ -307,7 +307,7 @@
"rev-parse",
"remotes/origin/flutter-3.2-candidate.5"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -329,7 +329,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -351,7 +351,7 @@
"rev-parse",
"remotes/origin/flutter-3.2-candidate.5"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -373,7 +373,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -422,7 +422,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -469,13 +469,13 @@
"@@@STEP_LOG_LINE@request@ \"change\": \"123456\",@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"flutter-review.googlesource.com\",@@@",
"@@@STEP_LOG_LINE@request@ \"patchset\": \"7\",@@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/flutter\"@@@",
"@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"flutter.googlesource.com\",@@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/flutter\",@@@",
"@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/flutter-3.2-candidate.5\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30,@@@",
@@ -806,14 +806,14 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -826,7 +826,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -877,11 +877,11 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--patch_root",
- "src/flutter",
+ ".",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -889,9 +889,9 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
- "https://flutter.googlesource.com/mirrors/engine@refs/heads/main:refs/changes/56/123456/7",
+ "https://flutter.googlesource.com/mirrors/flutter@refs/heads/main:refs/changes/56/123456/7",
"--revision",
- "src/flutter@refs/heads/flutter-3.2-candidate.5",
+ ".@refs/heads/flutter-3.2-candidate.5",
"--refs",
"refs/heads/flutter-3.2-candidate.5",
"--refs",
@@ -899,15 +899,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -928,7 +928,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -962,27 +962,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/heads/flutter-3.2-candidate.5\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/heads/flutter-3.2-candidate.5\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/flutter-3.2-candidate.5@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/flutter-3.2-candidate.5@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -991,9 +991,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"c4a31c27e7f051c5922b038742f6c3091d83bee1\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/flutter-3.2-candidate.5@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3fafc8c37bc80029d5b32cb2b81ed320826c3b81\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/flutter-3.2-candidate.5@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -1005,15 +1005,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1025,7 +1025,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1062,7 +1062,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -1108,7 +1108,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
@@ -1144,19 +1144,19 @@
"--json-output",
"/path/to/tmp/json",
"listdir",
- "[CACHE]/builder/src/out",
+ "[CACHE]/builder/engine/src/out",
"--recursive"
],
- "cwd": "[CACHE]/builder",
+ "cwd": "[CACHE]/builder/engine",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1168,7 +1168,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1201,23 +1201,23 @@
{
"cmd": [
"python3",
- "[CACHE]/builder/src/flutter/sky/tools/create_macos_framework.py",
+ "[CACHE]/builder/engine/src/flutter/sky/tools/create_macos_framework.py",
"--variant",
"host_profile",
"--type",
"engine",
"--engine-capture-core-dump"
],
- "cwd": "[CACHE]/builder",
+ "cwd": "[CACHE]/builder/engine",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1229,8 +1229,8 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1264,7 +1264,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -1289,7 +1289,7 @@
"rev-parse",
"remotes/origin/flutter-3.2-candidate.5"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -1314,7 +1314,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CACHE]/builder/src/flutter",
+ "cwd": "[CACHE]/builder/engine/src/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -1351,7 +1351,7 @@
}
},
"name": "Global generators.namelist",
- "stdin": "{\"zip_file\": \"[CACHE]/builder/src/a/b/c.txt\"}",
+ "stdin": "{\"zip_file\": \"[CACHE]/builder/engine/src/a/b/c.txt\"}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@",
@@ -1377,7 +1377,7 @@
}
},
"name": "Global generators.namelist (2)",
- "stdin": "{\"zip_file\": \"[CACHE]/builder/src/a/b/c.txt\"}",
+ "stdin": "{\"zip_file\": \"[CACHE]/builder/engine/src/a/b/c.txt\"}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@",
@@ -1413,14 +1413,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1432,7 +1432,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1485,14 +1485,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1504,7 +1504,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1549,14 +1549,14 @@
"[CLEANUP]/exported_p12.encrypted"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1568,7 +1568,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1600,14 +1600,14 @@
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1619,7 +1619,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"luci_context": {
@@ -1653,14 +1653,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1672,7 +1672,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1717,14 +1717,14 @@
"[CLEANUP]/0325_p12password.encrypted"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1736,7 +1736,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1768,14 +1768,14 @@
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1787,7 +1787,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"luci_context": {
@@ -1821,14 +1821,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1840,7 +1840,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1885,14 +1885,14 @@
"[CLEANUP]/codesign_team_id.encrypted"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1904,7 +1904,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1936,14 +1936,14 @@
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -1955,7 +1955,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"luci_context": {
@@ -1989,14 +1989,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2008,7 +2008,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -2053,14 +2053,14 @@
"[CLEANUP]/codesign_app_specific_password.encrypted"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2072,7 +2072,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -2104,14 +2104,14 @@
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2123,7 +2123,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"luci_context": {
@@ -2157,14 +2157,14 @@
"/path/to/tmp/json"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2176,7 +2176,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -2221,14 +2221,14 @@
"[CLEANUP]/codesign_app_store_id.encrypted"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2240,7 +2240,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -2272,14 +2272,14 @@
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2291,7 +2291,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"luci_context": {
@@ -2325,14 +2325,14 @@
"RECIPE_MODULE[flutter::signing]/resources/setup_keychain.dart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2344,7 +2344,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -2370,7 +2370,7 @@
"RECIPE_MODULE[flutter::signing]/resources/setup_keychain.dart"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
@@ -2380,8 +2380,8 @@
"CODESIGN_PATH": "[CLEANUP]/tmp_tmp_3/codesign",
"CODESIGN_TEAM_ID": "[CLEANUP]/CODESIGN_TEAM_ID",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_P12": "[CLEANUP]/FLUTTER_P12",
"FLUTTER_P12_PASSWORD": "[CLEANUP]/FLUTTER_P12_PASSWORD",
"GIT_BRANCH": "",
@@ -2397,7 +2397,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"luci_context": {
@@ -2431,7 +2431,7 @@
"gs://flutter_tmp_logs/8945511751514863184/setup_keychain_logs_00000000-0000-0000-0000-00000000133a.txt"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
@@ -2441,8 +2441,8 @@
"CODESIGN_PATH": "[CLEANUP]/tmp_tmp_3/codesign",
"CODESIGN_TEAM_ID": "[CLEANUP]/CODESIGN_TEAM_ID",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"FLUTTER_P12": "[CLEANUP]/FLUTTER_P12",
"FLUTTER_P12_PASSWORD": "[CLEANUP]/FLUTTER_P12_PASSWORD",
"GIT_BRANCH": "",
@@ -2458,7 +2458,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"infra_step": true,
@@ -2494,14 +2494,14 @@
"build.keychain"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2513,7 +2513,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"luci_context": {
@@ -2541,14 +2541,14 @@
"login.keychain"
],
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -2560,7 +2560,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"luci_context": {
@@ -2618,7 +2618,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/a/b/c.txt",
+ "[CACHE]/builder/engine/src/a/b/c.txt",
"[CLEANUP]/tmp_tmp_4/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
],
"infra_step": true,
@@ -2634,7 +2634,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Copy [CACHE]/builder/src/a/b/c.txt to tmp location",
+ "name": "Global generators.Copy [CACHE]/builder/engine/src/a/b/c.txt to tmp location",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -2665,7 +2665,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.gsutil Upload [CACHE]/builder/src/a/b/c.txt to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+ "name": "Global generators.gsutil Upload [CACHE]/builder/engine/src/a/b/c.txt to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
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 bf7a929..3f799ff 100644
--- a/recipes/engine_v2/engine_v2.expected/config_from_file.json
+++ b/recipes/engine_v2/engine_v2.expected/config_from_file.json
@@ -1,7 +1,7 @@
[
{
"cmd": [],
- "name": "Checkout flutter/engine"
+ "name": "Checkout flutter/flutter"
},
{
"cmd": [
@@ -9,9 +9,9 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[START_DIR]/engine",
+ "[START_DIR]/flutter",
"--url",
- "https://flutter.googlesource.com/mirrors/engine"
+ "https://flutter.googlesource.com/mirrors/flutter"
],
"luci_context": {
"realm": {
@@ -25,7 +25,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git setup",
+ "name": "Checkout flutter/flutter.git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -39,7 +39,7 @@
"--progress",
"--tags"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"env": {
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
@@ -56,7 +56,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git fetch",
+ "name": "Checkout flutter/flutter.git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -68,7 +68,7 @@
"-f",
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -82,7 +82,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git checkout",
+ "name": "Checkout flutter/flutter.git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -93,7 +93,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -107,7 +107,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.read revision",
+ "name": "Checkout flutter/flutter.read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -122,7 +122,7 @@
"-d",
"-x"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -136,7 +136,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git clean",
+ "name": "Checkout flutter/flutter.git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -147,7 +147,7 @@
"submodule",
"sync"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -161,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.submodule sync",
+ "name": "Checkout flutter/flutter.submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -174,7 +174,7 @@
"--init",
"--recursive"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -188,7 +188,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.submodule update",
+ "name": "Checkout flutter/flutter.submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -201,7 +201,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/engine/ci/builders/config_name.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/config_name.json",
"/path/to/tmp/"
],
"infra_step": true,
@@ -298,7 +298,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"proj\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -344,13 +344,13 @@
"@@@STEP_LOG_LINE@request@ \"change\": \"123456\",@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"flutter-review.googlesource.com\",@@@",
"@@@STEP_LOG_LINE@request@ \"patchset\": \"7\",@@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/flutter\"@@@",
"@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"flutter.googlesource.com\",@@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/flutter\",@@@",
"@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30,@@@",
@@ -681,14 +681,14 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -701,7 +701,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -752,11 +752,11 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--patch_root",
- "src/flutter",
+ ".",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -764,9 +764,9 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
- "https://flutter.googlesource.com/mirrors/engine@refs/heads/main:refs/changes/56/123456/7",
+ "https://flutter.googlesource.com/mirrors/flutter@refs/heads/main:refs/changes/56/123456/7",
"--revision",
- "src/flutter@refs/heads/main",
+ ".@refs/heads/main",
"--refs",
"refs/heads/main",
"--refs",
@@ -774,15 +774,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
"GIT_DAPPER_TRACE": "1",
@@ -803,7 +803,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -837,27 +837,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"refs/heads/main\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"e1f32bac24d72ebe0a5713009ae850c6320e7c7d\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"4206feabaa013b8825cf4dd0b97a4ef5b605280b\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"e1f32bac24d72ebe0a5713009ae850c6320e7c7d\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"4206feabaa013b8825cf4dd0b97a4ef5b605280b\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"e1f32bac24d72ebe0a5713009ae850c6320e7c7d\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"4206feabaa013b8825cf4dd0b97a4ef5b605280b\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -866,9 +866,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"e1f32bac24d72ebe0a5713009ae850c6320e7c7d\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"4206feabaa013b8825cf4dd0b97a4ef5b605280b\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -880,15 +880,15 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_REPORT_BUILD": "proj/try/try-builder/8945511751514863184",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -900,7 +900,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -937,7 +937,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CACHE]/builder/src/out"
+ "[CACHE]/builder/engine/src/out"
],
"infra_step": true,
"luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/delay_collect_builds.json b/recipes/engine_v2/engine_v2.expected/delay_collect_builds.json
index f2c14e4..b75e365 100644
--- a/recipes/engine_v2/engine_v2.expected/delay_collect_builds.json
+++ b/recipes/engine_v2/engine_v2.expected/delay_collect_builds.json
@@ -275,7 +275,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"is_fusion\": \"true\", \"luci_flags\": {\"delay_collect_builds\": true}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"luci_flags\": {\"delay_collect_builds\": true}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -384,7 +384,6 @@
"@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ ]@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"luci_flags\": {@@@",
"@@@STEP_LOG_LINE@request@ \"delay_collect_builds\": true@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json b/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
index 21fbe61..bce171b 100644
--- a/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
+++ b/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
@@ -201,7 +201,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/monorepo/ci/builders/config_name.json",
+ "[START_DIR]/monorepo/engine/src/flutter/ci/builders/config_name.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json b/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json
index bc3a10e..d0284f2 100644
--- a/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json
+++ b/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json
@@ -201,7 +201,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/monorepo/ci/builders/config_name.json",
+ "[START_DIR]/monorepo/engine/src/flutter/ci/builders/config_name.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipes/engine_v2/engine_v2.expected/overridden_config_from_file.json b/recipes/engine_v2/engine_v2.expected/overridden_config_from_file.json
index f0e4a78..5d1731e 100644
--- a/recipes/engine_v2/engine_v2.expected/overridden_config_from_file.json
+++ b/recipes/engine_v2/engine_v2.expected/overridden_config_from_file.json
@@ -1,7 +1,7 @@
[
{
"cmd": [],
- "name": "Checkout flutter/engine"
+ "name": "Checkout flutter/flutter"
},
{
"cmd": [
@@ -9,9 +9,9 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[START_DIR]/engine",
+ "[START_DIR]/flutter",
"--url",
- "https://flutter.googlesource.com/mirrors/engine"
+ "https://flutter.googlesource.com/mirrors/flutter"
],
"luci_context": {
"realm": {
@@ -25,7 +25,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git setup",
+ "name": "Checkout flutter/flutter.git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -39,7 +39,7 @@
"--progress",
"--tags"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"env": {
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
@@ -56,7 +56,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git fetch",
+ "name": "Checkout flutter/flutter.git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -68,7 +68,7 @@
"-f",
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -82,7 +82,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git checkout",
+ "name": "Checkout flutter/flutter.git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -93,7 +93,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -107,7 +107,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.read revision",
+ "name": "Checkout flutter/flutter.read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -122,7 +122,7 @@
"-d",
"-x"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -136,7 +136,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.git clean",
+ "name": "Checkout flutter/flutter.git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -147,7 +147,7 @@
"submodule",
"sync"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -161,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.submodule sync",
+ "name": "Checkout flutter/flutter.submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -174,7 +174,7 @@
"--init",
"--recursive"
],
- "cwd": "[START_DIR]/engine",
+ "cwd": "[START_DIR]/flutter",
"infra_step": true,
"luci_context": {
"realm": {
@@ -188,7 +188,7 @@
"hostname": "rdbhost"
}
},
- "name": "Checkout flutter/engine.submodule update",
+ "name": "Checkout flutter/flutter.submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -201,7 +201,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/engine/ci/builders/overridden_config_name.json",
+ "[START_DIR]/flutter/engine/src/flutter/ci/builders/overridden_config_name.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipes/engine_v2/engine_v2.expected/parallel_download_builds.json b/recipes/engine_v2/engine_v2.expected/parallel_download_builds.json
index d691e4f..5e23a6a 100644
--- a/recipes/engine_v2/engine_v2.expected/parallel_download_builds.json
+++ b/recipes/engine_v2/engine_v2.expected/parallel_download_builds.json
@@ -275,7 +275,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"is_fusion\": \"true\", \"luci_flags\": {\"parallel_download_builds\": true}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"prod\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"flutter\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"archives\": [{\"destination\": \"bucket/c.txt\", \"name\": \"c.txt\", \"source\": \"/a/b/c.txt\"}], \"build\": {\"archives\": [{\"base_path\": \"out/host_debug/zip_archives/\", \"include_paths\": [\"out/host_debug/zip_archives/darwin-x64/artifacts.zip\", \"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip\", \"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip\", \"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip\"], \"name\": \"host_debug\", \"type\": \"gcs\"}], \"drone_dimensions\": [\"os=Linux\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}, \"recipe\": \"engine_v2/builder\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"config_name\", \"gclient_variables\": {}, \"generators\": {\"tasks\": [{\"language\": \"python3\", \"name\": \"Debug-FlutterMacOS.framework\", \"parameters\": [\"--variant\", \"host_profile\", \"--type\", \"engine\", \"--engine-capture-core-dump\"], \"script\": \"flutter/sky/tools/create_macos_framework.py\", \"type\": \"local\"}]}, \"luci_flags\": {\"parallel_download_builds\": true}, \"parent_commit\": \"\", \"recipe\": \"engine_v2/builder\", \"tests\": []}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -384,7 +384,6 @@
"@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ ]@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"luci_flags\": {@@@",
"@@@STEP_LOG_LINE@request@ \"parallel_download_builds\": true@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
diff --git a/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json b/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json
index 476b667..2616605 100644
--- a/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json
+++ b/recipes/engine_v2/engine_v2.expected/respect_gclient_variables.json
@@ -201,7 +201,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/monorepo/ci/builders/config_name.json",
+ "[START_DIR]/monorepo/engine/src/flutter/ci/builders/config_name.json",
"/path/to/tmp/"
],
"infra_step": true,
diff --git a/recipes/engine_v2/engine_v2.py b/recipes/engine_v2/engine_v2.py
index 683229c..346e770 100644
--- a/recipes/engine_v2/engine_v2.py
+++ b/recipes/engine_v2/engine_v2.py
@@ -52,10 +52,8 @@
# Read builds configuration from repository under test.
if api.monorepo.is_monorepo_ci_build or api.monorepo.is_monorepo_try_build:
project = 'monorepo'
- elif api.repo_util.is_fusion():
- project = 'flutter'
else:
- project = 'engine'
+ project = 'flutter'
# Only check out the repository, not dependencies.
api.flutter_bcid.report_stage(BcidStage.FETCH.value)
@@ -66,10 +64,7 @@
url=api.properties.get('git_url'),
ref=api.properties.get('git_ref')
)
- if api.repo_util.is_fusion():
- engine_path = checkout_path / 'engine/src/flutter'
- else:
- engine_path = checkout_path
+ engine_path = checkout_path / 'engine/src/flutter'
config_path = engine_path / f'ci/builders/{config_name}.json'
config = api.file.read_json(
'Read build config file', config_path, test_data={}
@@ -147,8 +142,7 @@
)
env, env_prefixes = api.repo_util.engine_environment(full_engine_checkout)
api.repo_util.engine_checkout(full_engine_checkout, env, env_prefixes)
- if api.repo_util.is_fusion():
- full_engine_checkout = full_engine_checkout / 'engine'
+ full_engine_checkout = full_engine_checkout / 'engine'
# The checkouts are using cache which may have some old artifacts in the out
# directory. We are cleaning out the folder to ensure we start from an empty
# out folder.
@@ -340,7 +334,7 @@
project='flutter',
bucket='prod',
builder='prod-builder',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/main',
revision='a' * 40,
build_number=123,
@@ -369,7 +363,7 @@
project='dart-internal',
bucket='flutter',
builder='prod-builder',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/main',
revision='a' * 40,
build_number=123,
@@ -395,7 +389,7 @@
api.buildbucket.try_build(
project='proj',
builder='try-builder',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
revision='a' * 40,
build_number=123,
),
@@ -412,7 +406,7 @@
api.buildbucket.try_build(
project='proj',
builder='try-builder',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
revision='a' * 40,
build_number=123,
),
@@ -438,7 +432,7 @@
api.buildbucket.try_build(
project='proj',
builder='try-builder',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
revision='a' * 40,
build_number=123,
),
@@ -481,7 +475,7 @@
api.buildbucket.try_build(
project='proj',
builder='try-builder',
- git_repo='https://flutter.googlesource.com/mirrors/engine',
+ git_repo='https://flutter.googlesource.com/mirrors/flutter',
git_ref='refs/heads/flutter-3.2-candidate.5',
revision='a' * 40,
build_number=123,
@@ -611,7 +605,6 @@
generators=generators,
archives=archives,
config_name='config_name',
- is_fusion='true',
),
api.buildbucket.ci_build(
project='flutter',
@@ -642,7 +635,6 @@
generators=generators,
archives=archives,
config_name='config_name',
- is_fusion='true',
luci_flags={
"delay_collect_builds": True,
}
@@ -676,7 +668,6 @@
generators=generators,
archives=archives,
config_name='config_name',
- is_fusion='true',
luci_flags={
"parallel_download_builds": True,
}
diff --git a/recipes/engine_v2/tester_engine.expected/basic.json b/recipes/engine_v2/tester_engine.expected/basic.json
index be2953c..8c1dca2 100644
--- a/recipes/engine_v2/tester_engine.expected/basic.json
+++ b/recipes/engine_v2/tester_engine.expected/basic.json
@@ -77,9 +77,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': '.', 'url': 'https://flutter.googlesource.com/mirrors/flutter'}]",
"--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
+ "{\"got_engine_revision\": \".\"}",
"--git-cache-dir",
"[CACHE]/git",
"--cleanup-dir",
@@ -87,18 +87,18 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src/flutter@HEAD"
+ ".@HEAD"
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BACKENDINFO": "1",
"GIT_BRANCH": "",
@@ -120,7 +120,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -142,27 +142,27 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true,@@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"HEAD\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": null,@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"9221bca00ddbd888260084def81f09543281b952\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#205336}\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \".\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \".\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/..git\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ },@@@",
@@ -171,9 +171,9 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#205336}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"3a52ce780950d4d969792a2559cd519d7ee8c727\"@@@"
]
},
{
@@ -185,13 +185,13 @@
],
"cwd": "[CACHE]/builder",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -204,7 +204,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -232,13 +232,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -251,7 +251,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -284,13 +284,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -303,7 +303,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -346,13 +346,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -365,7 +365,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -406,13 +406,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -425,7 +425,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -461,13 +461,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -480,7 +480,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -512,13 +512,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -531,7 +531,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -572,13 +572,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -591,7 +591,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -618,13 +618,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -637,7 +637,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -669,13 +669,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -688,7 +688,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -718,13 +718,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -737,7 +737,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -764,7 +764,7 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
@@ -772,7 +772,7 @@
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -787,10 +787,10 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin",
"[CACHE]/chrome/chrome",
"[CACHE]/chrome/drivers",
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -824,13 +824,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -843,7 +843,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -874,13 +874,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -893,7 +893,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -932,13 +932,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -951,7 +951,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -982,13 +982,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1001,7 +1001,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1026,13 +1026,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1045,7 +1045,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1070,13 +1070,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1089,7 +1089,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1114,13 +1114,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1133,7 +1133,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1158,13 +1158,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1177,7 +1177,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -1205,13 +1205,13 @@
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_2",
"CLANG_MODULE_CACHE_PATH": "",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
@@ -1224,7 +1224,7 @@
},
"env_prefixes": {
"PATH": [
- "[CACHE]/builder/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+ "[CACHE]/builder/engine/src/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
diff --git a/recipes/release/release_builder.expected/base_linux_beta_monorepo.json b/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
index f6e48e3..3202629 100644
--- a/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
+++ b/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
@@ -410,7 +410,7 @@
}
},
"name": "engine.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\"}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -482,8 +482,7 @@
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@",
"@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@",
- "@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\"@@@",
+ "@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"scheduler\": \"release\"@@@",
@@ -491,7 +490,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"repository\": \"flutter\"@@@",
diff --git a/recipes/release/release_builder.expected/base_linux_main_monorepo.json b/recipes/release/release_builder.expected/base_linux_main_monorepo.json
index 59f256f..b2378e7 100644
--- a/recipes/release/release_builder.expected/base_linux_main_monorepo.json
+++ b/recipes/release/release_builder.expected/base_linux_main_monorepo.json
@@ -411,7 +411,7 @@
}
},
"name": "engine.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"linux one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"linux one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -480,7 +480,6 @@
"@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@",
"@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\"@@@",
@@ -488,7 +487,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -549,7 +547,7 @@
}
},
"name": "engine.launch builds.schedule (2)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\"}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -621,8 +619,7 @@
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@",
"@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@",
- "@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\"@@@",
+ "@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"scheduler\": \"release\"@@@",
@@ -630,7 +627,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"repository\": \"flutter\"@@@",
diff --git a/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json b/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
index 1db8fed..ee0c77f 100644
--- a/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
+++ b/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
@@ -424,7 +424,7 @@
}
},
"name": "engine.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"Linux implicity_disabled_by_top_level\", \"properties\": {\"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"Linux implicity_disabled_by_top_level\", \"properties\": {\"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -498,7 +498,6 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux implicity_disabled_by_top_level\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\"@@@",
@@ -506,7 +505,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -567,7 +565,7 @@
}
},
"name": "engine.launch builds.schedule (2)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"], \"name\": \"Linux explicitly_enabled_by_target\", \"properties\": {\"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"], \"name\": \"Linux explicitly_enabled_by_target\", \"properties\": {\"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -634,7 +632,6 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux explicitly_enabled_by_target\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\"@@@",
@@ -642,7 +639,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
diff --git a/recipes/release/release_builder.expected/filter_enabled_branches.json b/recipes/release/release_builder.expected/filter_enabled_branches.json
index 8470eae..7014a9d 100644
--- a/recipes/release/release_builder.expected/filter_enabled_branches.json
+++ b/recipes/release/release_builder.expected/filter_enabled_branches.json
@@ -412,7 +412,7 @@
}
},
"name": "engine.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Linux flutter_test\", \"properties\": {\"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Linux flutter_test\", \"properties\": {\"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -479,7 +479,6 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux flutter_test\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\"@@@",
@@ -487,7 +486,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -548,7 +546,7 @@
}
},
"name": "engine.launch builds.schedule (2)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Mac Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Mac flutter_test\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Mac Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Mac flutter_test\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -621,7 +619,6 @@
"@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@",
"@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\"@@@",
@@ -629,7 +626,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
diff --git a/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json b/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
index 8b84a96..c26b188 100644
--- a/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
+++ b/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
@@ -424,7 +424,7 @@
}
},
"name": "engine.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"Linux implicity_enabled_by_top_level\", \"properties\": {\"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"Linux implicity_enabled_by_top_level\", \"properties\": {\"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -498,7 +498,6 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux implicity_enabled_by_top_level\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\"@@@",
@@ -506,7 +505,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -567,7 +565,7 @@
}
},
"name": "engine.launch builds.schedule (2)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"], \"name\": \"Linux explicitly_enabled_by_target\", \"properties\": {\"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"], \"name\": \"Linux explicitly_enabled_by_target\", \"properties\": {\"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -634,7 +632,6 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux explicitly_enabled_by_target\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\"@@@",
@@ -642,7 +639,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
diff --git a/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json b/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
index 00b865b..e2de65a 100644
--- a/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
+++ b/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
@@ -530,7 +530,7 @@
}
},
"name": "framework.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"stable\"], \"name\": \"Linux only_enabled_for_release_channels\", \"properties\": {\"is_fusion\": \"true\"}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"stable\"], \"name\": \"Linux only_enabled_for_release_channels\", \"properties\": {}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -597,16 +597,13 @@
"@@@STEP_LOG_LINE@request@ \"stable\"@@@",
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux only_enabled_for_release_channels\",@@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\"@@@",
- "@@@STEP_LOG_LINE@request@ },@@@",
+ "@@@STEP_LOG_LINE@request@ \"properties\": {},@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"scheduler\": \"release\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"repository\": \"flutter\"@@@",
diff --git a/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json b/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
index 1bb1960..b03820c 100644
--- a/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
+++ b/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
@@ -501,7 +501,7 @@
}
},
"name": "framework.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\"], \"name\": \"Linux is_current_platform\", \"properties\": {\"is_fusion\": \"true\"}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\"], \"name\": \"Linux is_current_platform\", \"properties\": {}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -566,16 +566,13 @@
"@@@STEP_LOG_LINE@request@ \"beta\"@@@",
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux is_current_platform\",@@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\"@@@",
- "@@@STEP_LOG_LINE@request@ },@@@",
+ "@@@STEP_LOG_LINE@request@ \"properties\": {},@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"scheduler\": \"release\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"repository\": \"flutter\"@@@",
diff --git a/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json b/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
index 2b6ac88..ba3b84a 100644
--- a/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
+++ b/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
@@ -535,7 +535,7 @@
}
},
"name": "framework.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"flutter\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"dart-internal\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Linux flutter_test\", \"properties\": {\"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"flutter\", \"builder\": \"Linux Production Engine Drone\", \"project\": \"dart-internal\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Linux flutter_test\", \"properties\": {\"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -602,7 +602,6 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux flutter_test\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\"@@@",
@@ -610,7 +609,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -671,7 +669,7 @@
}
},
"name": "framework.launch builds.schedule (2)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"flutter\", \"builder\": \"Mac Production Engine Drone\", \"project\": \"dart-internal\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Mac flutter_test\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"flutter\", \"builder\": \"Mac Production Engine Drone\", \"project\": \"dart-internal\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Mac flutter_test\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -744,7 +742,6 @@
"@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@",
"@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\"@@@",
@@ -752,7 +749,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
diff --git a/recipes/release/release_builder.expected/linux_schedule_during_release_override.json b/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
index 5e76c5f..02d8e5c 100644
--- a/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
+++ b/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
@@ -412,7 +412,7 @@
}
},
"name": "engine.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Linux flutter_test\", \"properties\": {\"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Linux flutter_test\", \"properties\": {\"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -479,7 +479,6 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux flutter_test\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\"@@@",
@@ -487,7 +486,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -548,7 +546,7 @@
}
},
"name": "engine.launch builds.schedule (2)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Mac Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Mac flutter_test\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Mac Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Mac flutter_test\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -621,7 +619,6 @@
"@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@",
"@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\"@@@",
@@ -629,7 +626,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -909,7 +905,7 @@
}
},
"name": "framework.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"Linux schedule_during_release_override\", \"properties\": {\"is_fusion\": \"true\"}, \"recipe\": \"release/something\", \"schedule_during_release_override\": true}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133d\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"Linux schedule_during_release_override\", \"properties\": {}, \"recipe\": \"release/something\", \"schedule_during_release_override\": true}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133d\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -972,16 +968,13 @@
"@@@STEP_LOG_LINE@request@ \"os=Linux\"@@@",
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux schedule_during_release_override\",@@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\"@@@",
- "@@@STEP_LOG_LINE@request@ },@@@",
+ "@@@STEP_LOG_LINE@request@ \"properties\": {},@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"schedule_during_release_override\": true@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"repository\": \"flutter\"@@@",
diff --git a/recipes/release/release_builder.expected/linux_scheduler_release.json b/recipes/release/release_builder.expected/linux_scheduler_release.json
index fab533a..4a4cedb 100644
--- a/recipes/release/release_builder.expected/linux_scheduler_release.json
+++ b/recipes/release/release_builder.expected/linux_scheduler_release.json
@@ -412,7 +412,7 @@
}
},
"name": "engine.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Linux flutter_test\", \"properties\": {\"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Linux flutter_test\", \"properties\": {\"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -479,7 +479,6 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux flutter_test\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\"@@@",
@@ -487,7 +486,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -548,7 +546,7 @@
}
},
"name": "engine.launch builds.schedule (2)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Mac Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Mac flutter_test\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Mac Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"enabled_branches\": [\"flutter-3.2-candidate.5\"], \"name\": \"Mac flutter_test\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": \"true\"}, \"recipe\": \"release/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -621,7 +619,6 @@
"@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@",
"@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\"@@@",
@@ -629,7 +626,6 @@
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
@@ -909,7 +905,7 @@
}
},
"name": "framework.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"Linux scheduler_release\", \"properties\": {\"is_fusion\": \"true\"}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133d\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"Linux scheduler_release\", \"properties\": {}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133d\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -972,16 +968,13 @@
"@@@STEP_LOG_LINE@request@ \"os=Linux\"@@@",
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux scheduler_release\",@@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\"@@@",
- "@@@STEP_LOG_LINE@request@ },@@@",
+ "@@@STEP_LOG_LINE@request@ \"properties\": {},@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"scheduler\": \"release\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"repository\": \"flutter\"@@@",
diff --git a/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json b/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
index 9fd5213..f9ba548 100644
--- a/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
+++ b/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
@@ -413,7 +413,7 @@
}
},
"name": "engine.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"], \"name\": \"Linux foo\", \"properties\": {\"config_name\": \"foo\", \"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"foo\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\", \"retry_override_list\": \"foo\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"], \"name\": \"Linux foo\", \"properties\": {\"config_name\": \"foo\", \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"config_name\": \"foo\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\", \"retry_override_list\": \"foo\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -481,7 +481,6 @@
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux foo\",@@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"config_name\": \"foo\",@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\"@@@",
@@ -490,7 +489,6 @@
"@@@STEP_LOG_LINE@request@ \"config_name\": \"foo\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"release_build\": \"true\",@@@",
diff --git a/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json b/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
index 99c4fd2..b6ddd51 100644
--- a/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
+++ b/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
@@ -491,7 +491,7 @@
}
},
"name": "framework.launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"], \"name\": \"Linux only_enabled_for_release_candidates\", \"properties\": {\"is_fusion\": \"true\"}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\", \"retry_override_list\": \"foo\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/flutter-3.2-candidate.5\"}, \"executionTimeout\": \"14400s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/flutter-3.2-candidate.5\"}, \"priority\": 30, \"properties\": {\"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"], \"name\": \"Linux only_enabled_for_release_candidates\", \"properties\": {}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\", \"retry_override_list\": \"foo\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -557,16 +557,13 @@
"@@@STEP_LOG_LINE@request@ \"flutter-\\\\d+\\\\.\\\\d+-candidate\\\\.\\\\d+\"@@@",
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"name\": \"Linux only_enabled_for_release_candidates\",@@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\"@@@",
- "@@@STEP_LOG_LINE@request@ },@@@",
+ "@@@STEP_LOG_LINE@request@ \"properties\": {},@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"scheduler\": \"release\"@@@",
"@@@STEP_LOG_LINE@request@ },@@@",
"@@@STEP_LOG_LINE@request@ \"build_identifier\": \"8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\",@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
- "@@@STEP_LOG_LINE@request@ \"is_fusion\": \"true\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_commit\": \"\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\",@@@",
"@@@STEP_LOG_LINE@request@ \"repository\": \"flutter\",@@@",
diff --git a/recipes/release/release_builder.py b/recipes/release/release_builder.py
index e59c366..fd5907a 100644
--- a/recipes/release/release_builder.py
+++ b/recipes/release/release_builder.py
@@ -205,7 +205,6 @@
continue
target = api.shard_util.pre_process_properties(target)
properties = target.setdefault('properties', {})
- properties['is_fusion'] = 'true'
tasks.update(
api.shard_util.schedule(
[target],
