flutter319: drop

From dd74740ddceac81e748a7e7834c28135abc59454 Mon Sep 17 00:00:00 2001

From: Brandon DeRosier <bdero@google.com>

Date: Tue, 16 Jan 2024 11:00:34 -0800

Subject: [PATCH] [Flutter GPU] Fix playground shader paths. (#49790)

Resolves https://github.com/flutter/flutter/issues/140969.

Makes the shader paths absolute to prevent issues caused by the working

directory differing across build environments.

---

 impeller/fixtures/BUILD.gn  | 3 ++-

 impeller/tools/impeller.gni | 2 +-

 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/impeller/fixtures/BUILD.gn b/impeller/fixtures/BUILD.gn

index 9165f06542a2a..5ea90ab3969f3 100644

--- a/impeller/fixtures/BUILD.gn

+++ b/impeller/fixtures/BUILD.gn

@@ -131,7 +131,8 @@

     "flutter_gpu_texture.vert",

   ]

   shader_target_flags = [ "--runtime-stage-metal" ]

-  shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.vert\"}}"

+  fixtures = rebase_path("//flutter/impeller/fixtures")

+  shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_texture.vert\"}}"

   shader_bundle_output = "playground.shaderbundle"

 }

diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni

index 6541c3b12173b..2ab7ec0f0b07a 100644

--- a/impeller/tools/impeller.gni

+++ b/impeller/tools/impeller.gni

@@ -313,7 +313,7 @@

   if (defined(invoker.shader_bundle)) {

     assert(

         defined(invoker.shader_bundle_output),

-        "When shader_bundle is specified, shader_output_bundle must also be specified.")

+        "When shader_bundle is specified, shader_bundle_output must also be specified.")

   }

   sksl = false

diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart

index 252021cf78..e50ef0885d 100644

--- a/packages/flutter_tools/lib/src/flutter_cache.dart

+++ b/packages/flutter_tools/lib/src/flutter_cache.dart

@@ -51,14 +51,6 @@ class FlutterCache extends Cache {

       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));

     }

     registerArtifact(FontSubsetArtifacts(this, platform: platform));

-    registerArtifact(PubDependencies(

-      logger: logger,

-      // flutter root and pub must be lazily initialized to avoid accessing

-      // before the version is determined.

-      flutterRoot: () => Cache.flutterRoot!,

-      pub: () => pub,

-      projectFactory: projectFactory,

-    ));

   }

 }

 No newline at end of file

diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh

index 75d9d3013e..657ad3cb78 100644

--- a/bin/internal/shared.sh

+++ b/bin/internal/shared.sh

@@ -245,7 +245,7 @@ function shared::execute() {

   # and will corrupt each others' downloads.

   #

   # SHARED_NAME itself is prepared by the caller script.

-  upgrade_flutter 7< "$SHARED_NAME"

+  # upgrade_flutter 7< "$SHARED_NAME"

   BIN_NAME="$(basename "$PROG_NAME")"

   case "$BIN_NAME" in

diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart

index b7e624b4e2..edfdde118b 100644

--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart

+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart

@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and

     // Populate the cache. We call this before pub get below so that the

     // sky_engine package is available in the flutter cache for pub to find.

-    if (shouldUpdateCache) {

+    if (false) {

       // First always update universal artifacts, as some of these (e.g.

       // ios-deploy on macOS) are required to determine `requiredArtifacts`.

       final bool offline;

diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

index 5d6d78639f..90a4dfa555 100644

--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> {

           globals.flutterUsage.suppressAnalytics = true;

         }

-        globals.flutterVersion.ensureVersionFile();

         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;

         final bool ci = await globals.botDetector.isRunningOnBot;

         final bool redirectedCompletion = !globals.stdio.hasTerminal &&

@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> {

         final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false;

         final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag;

-        if (topLevelResults.command?.name != 'upgrade' &&

-            (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {

-          await globals.flutterVersion.checkFlutterVersionFreshness();

-        }

-

         // See if the user specified a specific device.

         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;

         if (specifiedDeviceId != null) {