From f41c102ace09245f8447ed476c0cb924534d964f Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Thu, 16 Feb 2023 15:50:16 -0500 Subject: [PATCH 1/3] [web] Copy canvaskit_chromium/* to canvaskit/chromium/* --- lib/web_ui/dev/steps/compile_tests_step.dart | 1 + web_sdk/BUILD.gn | 33 ++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/lib/web_ui/dev/steps/compile_tests_step.dart b/lib/web_ui/dev/steps/compile_tests_step.dart index 19b9759e785c0..145023c30e2bc 100644 --- a/lib/web_ui/dev/steps/compile_tests_step.dart +++ b/lib/web_ui/dev/steps/compile_tests_step.dart @@ -172,6 +172,7 @@ Future copySkwasm() async { final io.Directory _localCanvasKitDir = io.Directory(pathlib.join( environment.wasmReleaseOutDir.path, + 'flutter_web_sdk', 'canvaskit', )); final io.File _localCanvasKitWasm = io.File(pathlib.join( diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn index e36947b157206..9da0c8265a03b 100644 --- a/web_sdk/BUILD.gn +++ b/web_sdk/BUILD.gn @@ -533,6 +533,30 @@ group("flutter_ddc_modules") { ] } +if (build_canvaskit) { + copy("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}}" ] + deps = [ "//flutter/third_party/canvaskit:canvaskit_group" ] + } +} + +if (build_canvaskit_chromium) { + copy("canvaskit_chromium") { + sources = [ + "$root_out_dir/canvaskit_chromium/canvaskit.js", + "$root_out_dir/canvaskit_chromium/canvaskit.wasm", + ] + outputs = [ + "$root_out_dir/flutter_web_sdk/canvaskit/chromium/{{source_file_part}}", + ] + deps = [ "//flutter/third_party/canvaskit:canvaskit_chromium_group" ] + } +} + # Archives Flutter Web SDK if (!is_fuchsia) { zip_bundle_from_file("flutter_web_sdk_archive") { @@ -582,6 +606,15 @@ if (!is_fuchsia) { sources += get_target_outputs(web_engine_library) } + if (build_canvaskit) { + deps += [ ":canvaskit" ] + sources += get_target_outputs(":canvaskit") + } + if (build_canvaskit_chromium) { + deps += [ ":canvaskit_chromium" ] + sources += get_target_outputs(":canvaskit_chromium") + } + tmp_files = [] web_sdk_files = filter_include(sources, [ "$root_build_dir/flutter_web_sdk/**" ]) From 7c9d9b7301a381aca6d99e159854bc7623f42cd3 Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Fri, 3 Mar 2023 15:07:28 -0500 Subject: [PATCH 2/3] some changes --- third_party/canvaskit/BUILD.gn | 8 +++++++- web_sdk/BUILD.gn | 37 ++-------------------------------- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/third_party/canvaskit/BUILD.gn b/third_party/canvaskit/BUILD.gn index 63776f68d8585..188bfdff04692 100644 --- 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 index 9da0c8265a03b..5acdef2c60392 100644 --- a/web_sdk/BUILD.gn +++ b/web_sdk/BUILD.gn @@ -533,30 +533,6 @@ group("flutter_ddc_modules") { ] } -if (build_canvaskit) { - copy("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}}" ] - deps = [ "//flutter/third_party/canvaskit:canvaskit_group" ] - } -} - -if (build_canvaskit_chromium) { - copy("canvaskit_chromium") { - sources = [ - "$root_out_dir/canvaskit_chromium/canvaskit.js", - "$root_out_dir/canvaskit_chromium/canvaskit.wasm", - ] - outputs = [ - "$root_out_dir/flutter_web_sdk/canvaskit/chromium/{{source_file_part}}", - ] - deps = [ "//flutter/third_party/canvaskit:canvaskit_chromium_group" ] - } -} - # Archives Flutter Web SDK if (!is_fuchsia) { zip_bundle_from_file("flutter_web_sdk_archive") { @@ -606,15 +582,6 @@ if (!is_fuchsia) { sources += get_target_outputs(web_engine_library) } - if (build_canvaskit) { - deps += [ ":canvaskit" ] - sources += get_target_outputs(":canvaskit") - } - if (build_canvaskit_chromium) { - deps += [ ":canvaskit_chromium" ] - sources += get_target_outputs(":canvaskit_chromium") - } - tmp_files = [] web_sdk_files = filter_include(sources, [ "$root_build_dir/flutter_web_sdk/**" ]) @@ -636,11 +603,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" }, { From 8d5a9d44d155e0bc0df254fe9eb186a0a84cd16e Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Fri, 3 Mar 2023 16:06:01 -0500 Subject: [PATCH 3/3] fix path in tests --- lib/web_ui/dev/steps/compile_tests_step.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/web_ui/dev/steps/compile_tests_step.dart b/lib/web_ui/dev/steps/compile_tests_step.dart index 145023c30e2bc..19b9759e785c0 100644 --- a/lib/web_ui/dev/steps/compile_tests_step.dart +++ b/lib/web_ui/dev/steps/compile_tests_step.dart @@ -172,7 +172,6 @@ Future copySkwasm() async { final io.Directory _localCanvasKitDir = io.Directory(pathlib.join( environment.wasmReleaseOutDir.path, - 'flutter_web_sdk', 'canvaskit', )); final io.File _localCanvasKitWasm = io.File(pathlib.join(