From f9989a551dfd6d5d48bc5f0dacac4ce189c5dfbd Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Fri, 3 Mar 2023 17:07:49 -0500 Subject: [PATCH] [web] Copy canvaskit_chromium/* to canvaskit/chromium/* (flutter/engine#39796) [web] Copy canvaskit_chromium/* to canvaskit/chromium/* --- engine/src/flutter/third_party/canvaskit/BUILD.gn | 8 +++++++- engine/src/flutter/web_sdk/BUILD.gn | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/engine/src/flutter/third_party/canvaskit/BUILD.gn b/engine/src/flutter/third_party/canvaskit/BUILD.gn index 63776f68d8..188bfdff04 100644 --- a/engine/src/flutter/third_party/canvaskit/BUILD.gn +++ b/engine/src/flutter/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/engine/src/flutter/web_sdk/BUILD.gn b/engine/src/flutter/web_sdk/BUILD.gn index a147d67d2c..957510f08e 100644 --- a/engine/src/flutter/web_sdk/BUILD.gn +++ b/engine/src/flutter/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" }, {