Copy canvaskit files directly into flutter_web_sdk (flutter#40951)

Copy canvaskit files directly into `flutter_web_sdk`
zanderso · Apr 5, 2023 · 55d7806 · 55d7806
1 parent 610cdf0
commit 55d7806
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 33 deletions.
diff --git a/third_party/canvaskit/BUILD.gn b/third_party/canvaskit/BUILD.gn
@@ -21,9 +21,15 @@ wasm_toolchain("canvaskit") {
   }
 }
 
-group("canvaskit_group") {
+copy("canvaskit_group") {
   visibility = [ "//flutter/web_sdk:*" ]
   public_deps = [ "//third_party/skia/modules/canvaskit(:canvaskit)" ]
+
+  sources = [
+    "$root_out_dir/canvaskit/canvaskit.js",
+    "$root_out_dir/canvaskit/canvaskit.wasm",
+  ]
+  outputs = [ "$root_out_dir/flutter_web_sdk/canvaskit/{{source_file_part}}" ]
 }
 
 # This toolchain is only to be used by canvaskit_chromium_group below.
@@ -57,5 +63,19 @@ copy("canvaskit_chromium_group") {
     "$root_out_dir/canvaskit_chromium/canvaskit.js",
     "$root_out_dir/canvaskit_chromium/canvaskit.wasm",
   ]
-  outputs = [ "$root_out_dir/canvaskit/chromium/{{source_file_part}}" ]
+  outputs = [
+    "$root_out_dir/flutter_web_sdk/canvaskit/chromium/{{source_file_part}}",
+  ]
+}
+
+copy("skwasm_group") {
+  visibility = [ "//flutter/web_sdk:*" ]
+  public_deps = [ "//flutter/lib/web_ui/skwasm" ]
+
+  sources = [
+    "$root_out_dir/skwasm.js",
+    "$root_out_dir/skwasm.wasm",
+    "$root_out_dir/skwasm.worker.js",
+  ]
+  outputs = [ "$root_out_dir/flutter_web_sdk/canvaskit/{{source_file_part}}" ]
 }
diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn
@@ -576,7 +576,7 @@ if (!is_fuchsia) {
              ":flutter_platform_dills",
              "//flutter/third_party/canvaskit:canvaskit_group",
              "//flutter/third_party/canvaskit:canvaskit_chromium_group",
-             "//flutter/lib/web_ui/skwasm",
+             "//flutter/third_party/canvaskit:skwasm_group",
            ] + web_engine_libraries
 
     # flutter_ddc_modules
@@ -595,6 +595,15 @@ if (!is_fuchsia) {
     sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound")
     sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_unsound")
     sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_sound")
+    sources += [
+      "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js",
+      "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.wasm",
+      "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.js",
+      "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.wasm",
+      "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.js",
+      "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.wasm",
+      "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.worker.js",
+    ]
 
     # TODO(jacksongardner): remove these once they are no longer used by the flutter tool
     # https://github.com/flutter/flutter/issues/113303
@@ -618,36 +627,6 @@ if (!is_fuchsia) {
         },
       ]
     }
-    tmp_files += [
-      {
-        source = rebase_path("$root_out_dir/canvaskit/canvaskit.js")
-        destination = "canvaskit/canvaskit.js"
-      },
-      {
-        source = rebase_path("$root_out_dir/canvaskit/canvaskit.wasm")
-        destination = "canvaskit/canvaskit.wasm"
-      },
-      {
-        source = rebase_path("$root_out_dir/canvaskit/chromium/canvaskit.js")
-        destination = "canvaskit/chromium/canvaskit.js"
-      },
-      {
-        source = rebase_path("$root_out_dir/canvaskit/chromium/canvaskit.wasm")
-        destination = "canvaskit/chromium/canvaskit.wasm"
-      },
-      {
-        source = rebase_path("$root_out_dir/skwasm.js")
-        destination = "canvaskit/skwasm.js"
-      },
-      {
-        source = rebase_path("$root_out_dir/skwasm.worker.js")
-        destination = "canvaskit/skwasm.worker.js"
-      },
-      {
-        source = rebase_path("$root_out_dir/skwasm.wasm")
-        destination = "canvaskit/skwasm.wasm"
-      },
-    ]
     files = tmp_files
   }
 }