Standardize the embedder file name. (flutter#31723)

mnordine · Mar 1, 2022 · 9ebbc6e · 9ebbc6e
1 parent e97c801
commit 9ebbc6e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/build/archives/BUILD.gn b/build/archives/BUILD.gn
@@ -42,9 +42,9 @@ zip_bundle("artifacts") {
   }
 }
 
-if (host_os == "linux") {
-  group("linux-embedder") {
-    deps = [ "//flutter/shell/platform/embedder:linux-embedder-archive" ]
+if (host_os == "linux" || host_os == "win") {
+  group("embedder") {
+    deps = [ "//flutter/shell/platform/embedder:embedder-archive" ]
   }
 }
 

diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn
@@ -428,9 +428,9 @@ group("flutter_engine") {
   }
 }
 
-if (host_os == "linux") {
-  zip_bundle("linux-embedder-archive") {
-    output = "${host_os}-${target_cpu}/${host_os}-${target_cpu}-embedder"
+if (host_os == "linux" || host_os == "win") {
+  zip_bundle("embedder-archive") {
+    output = "$full_platform_name/$full_platform_name-embedder.zip"
     deps = [
       "//flutter/shell/platform/embedder:copy_headers",
       "//flutter/shell/platform/embedder:flutter_engine_library",
@@ -440,10 +440,26 @@ if (host_os == "linux") {
         source = "$root_out_dir/flutter_embedder.h"
         destination = "flutter_embedder.h"
       },
-      {
-        source = "$root_out_dir/libflutter_engine.so"
-        destination = "libflutter_engine.so"
-      },
     ]
+    if (host_os == "linux") {
+      files += [
+        {
+          source = "$root_out_dir/libflutter_engine.so"
+          destination = "libflutter_engine.so"
+        },
+      ]
+    }
+    if (host_os == "win") {
+      files += [
+        {
+          source = "$root_out_dir/flutter_engine.dll"
+          destination = "flutter_engine.dll"
+        },
+        {
+          source = "$root_out_dir/flutter_engine.dll.lib"
+          destination = "flutter_engine.dll.lib"
+        },
+      ]
+    }
   }
 }