[web] Copy canvaskit_chromium/* to canvaskit/chromium/* (#39796)

mdebbar · web-flow · commit 249e78dfb025 · 2023-03-03T22:07:49.000Z
[web] Copy canvaskit_chromium/* to canvaskit/chromium/*
diff --git a/third_party/canvaskit/BUILD.gn b/third_party/canvaskit/BUILD.gn
@@ -26,7 +26,13 @@ wasm_toolchain("canvaskit_chromium") {
   }
 }
 
-group("canvaskit_chromium_group") {
+copy("canvaskit_chromium_group") {
   visibility = [ "//flutter/web_sdk:*" ]
   public_deps = [ "//third_party/skia/modules/canvaskit(:canvaskit_chromium)" ]
+
+  sources = [
+    "$root_out_dir/canvaskit_chromium/canvaskit.js",
+    "$root_out_dir/canvaskit_chromium/canvaskit.wasm",
+  ]
+  outputs = [ "$root_out_dir/canvaskit/chromium/{{source_file_part}}" ]
 }
diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn
@@ -611,11 +611,11 @@ if (!is_fuchsia) {
         destination = "canvaskit/canvaskit.wasm"
       },
       {
-        source = rebase_path("$root_out_dir/canvaskit_chromium/canvaskit.js")
+        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")
+        source = rebase_path("$root_out_dir/canvaskit/chromium/canvaskit.wasm")
         destination = "canvaskit/chromium/canvaskit.wasm"
       },
       {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,13 @@ wasm_toolchain("canvaskit_chromium") {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-group("canvaskit_chromium_group") {`
	`29`	`+copy("canvaskit_chromium_group") {`
`30`	`30`	`visibility = [ "//flutter/web_sdk:*" ]`
`31`	`31`	`public_deps = [ "//third_party/skia/modules/canvaskit(:canvaskit_chromium)" ]`
	`32`	`+`
	`33`	`+ sources = [`
	`34`	`+ "$root_out_dir/canvaskit_chromium/canvaskit.js",`
	`35`	`+ "$root_out_dir/canvaskit_chromium/canvaskit.wasm",`
	`36`	`+ ]`
	`37`	`+ outputs = [ "$root_out_dir/canvaskit/chromium/{{source_file_part}}" ]`
`32`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -611,11 +611,11 @@ if (!is_fuchsia) {`
`611`	`611`	`destination = "canvaskit/canvaskit.wasm"`
`612`	`612`	`},`
`613`	`613`	`{`
`614`		`- source = rebase_path("$root_out_dir/canvaskit_chromium/canvaskit.js")`
	`614`	`+ source = rebase_path("$root_out_dir/canvaskit/chromium/canvaskit.js")`
`615`	`615`	`destination = "canvaskit/chromium/canvaskit.js"`
`616`	`616`	`},`
`617`	`617`	`{`
`618`		`- source = rebase_path("$root_out_dir/canvaskit_chromium/canvaskit.wasm")`
	`618`	`+ source = rebase_path("$root_out_dir/canvaskit/chromium/canvaskit.wasm")`
`619`	`619`	`destination = "canvaskit/chromium/canvaskit.wasm"`
`620`	`620`	`},`
`621`	`621`	`{`