From e11ed85b7a4beea0feb3cd0d75a5eca044df9a4a Mon Sep 17 00:00:00 2001
From: godofredoc <godofredoc@google.com>
Date: Thu, 23 Mar 2023 13:58:57 -0700
Subject: [PATCH] Use target platform name when generating artifacts.
 (flutter/engine#40519)

Use target platform name when generating artifacts.
---
 engine/src/flutter/build/archives/BUILD.gn | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/engine/src/flutter/build/archives/BUILD.gn b/engine/src/flutter/build/archives/BUILD.gn
index 4d6d2f4c841..5530c637846 100644
--- a/engine/src/flutter/build/archives/BUILD.gn
+++ b/engine/src/flutter/build/archives/BUILD.gn
@@ -38,13 +38,16 @@ if (build_engine_artifacts && !is_android) {
       # TODO(godofredoc): Remove after paths are standardized flutter/flutter#105351.
       # Mac artifacts sometimes use mac and sometimes darwin. Standardizing the
       # names will require changes in the list of artifacts the tool is downloading.
-      prefix = "darwin-$target_cpu/"
+      if (flutter_runtime_mode == "debug") {
+        prefix = "darwin-$target_cpu/"
+      } else {
+        prefix = "darwin-$target_cpu-$flutter_runtime_mode/"
+      }
+    } else if (flutter_runtime_mode != "debug") {
+      prefix = "$full_target_platform_name-$flutter_runtime_mode/"
     } else {
       prefix = "$full_target_platform_name/"
     }
-    if (flutter_runtime_mode != "debug") {
-      prefix = "$full_platform_name-$flutter_runtime_mode/"
-    }
     output = "$prefix/artifacts.zip"
 
     exe = ""