From bcfc44b6d6f9cd2aa3d9e7614b2302b466ba03c8 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 9 Dec 2022 15:14:37 -0800 Subject: [PATCH 1/2] Move canvaskit artifacts to expected location in Web SDK Archive --- web_sdk/BUILD.gn | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn index 42ac8a5dece79..21ba1f708efbe 100644 --- a/web_sdk/BUILD.gn +++ b/web_sdk/BUILD.gn @@ -603,11 +603,19 @@ if (!is_fuchsia) { tmp_files += [ { source = rebase_path("$root_out_dir/canvaskit.js") - destination = "canvaskit/canvaskit.js" + destination = "flutter_web_sdk/canvaskit/canvaskit.js" }, { source = rebase_path("$root_out_dir/canvaskit.wasm") - destination = "canvaskit/canvaskit.wasm" + destination = "flutter_web_sdk/canvaskit/canvaskit.wasm" + }, + { + source = rebase_path("$root_out_dir/canvaskit.js") + destination = "flutter_web_sdk/canvaskit/profiling/canvaskit.js" + }, + { + source = rebase_path("$root_out_dir/canvaskit.wasm") + destination = "flutter_web_sdk/canvaskit/profiling/canvaskit.wasm" }, ] } From 131bd2ff41d00b0a39a6b05caadf8cbc96991c23 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 9 Dec 2022 15:52:55 -0800 Subject: [PATCH 2/2] Don't put profiling copies in the zip --- web_sdk/BUILD.gn | 8 -------- 1 file changed, 8 deletions(-) diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn index 21ba1f708efbe..d76ba1c9c3dd1 100644 --- a/web_sdk/BUILD.gn +++ b/web_sdk/BUILD.gn @@ -609,14 +609,6 @@ if (!is_fuchsia) { source = rebase_path("$root_out_dir/canvaskit.wasm") destination = "flutter_web_sdk/canvaskit/canvaskit.wasm" }, - { - source = rebase_path("$root_out_dir/canvaskit.js") - destination = "flutter_web_sdk/canvaskit/profiling/canvaskit.js" - }, - { - source = rebase_path("$root_out_dir/canvaskit.wasm") - destination = "flutter_web_sdk/canvaskit/profiling/canvaskit.wasm" - }, ] } files = tmp_files