···1111 BIN_NAME="$(basename "$PROG_NAME")"
1212 case "$BIN_NAME" in
1313 flutter*)
1414-diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
1515-index 13efbde879..467b3a7cbf 100644
1616---- a/packages/flutter_tools/lib/src/cache.dart
1717-+++ b/packages/flutter_tools/lib/src/cache.dart
1818-@@ -664,6 +664,7 @@ class Cache {
1414+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
1515+index b7e624b4e2..edfdde118b 100644
1616+--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
1717++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
1818+@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
19192020- /// Update the cache to contain all `requiredArtifacts`.
2121- Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async {
2222-+ return;
2323- if (!_lockEnabled) {
2424- return;
2525- }
2020+ // Populate the cache. We call this before pub get below so that the
2121+ // sky_engine package is available in the flutter cache for pub to find.
2222+- if (shouldUpdateCache) {
2323++ if (false) {
2424+ // First always update universal artifacts, as some of these (e.g.
2525+ // ios-deploy on macOS) are required to determine `requiredArtifacts`.
2626+ final bool offline;
2627diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
2728index 5d6d78639f..90a4dfa555 100644
2829--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart