Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[web] Build multiple CanvasKit variants (using toolchain_args) #38448

Merged
merged 21 commits into from
Jan 23, 2023
Merged

[web] Build multiple CanvasKit variants (using toolchain_args) #38448

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0b6486f
[web] New gn for building CanvasKit
mdebbar Dec 21, 2022
251e970
Merge branch 'main' into ck_gn
mdebbar Dec 21, 2022
fbcaf7d
Use toolchain_args to override CanvasKit gn args
mdebbar Dec 19, 2022
bb376cc
Use correct path for the generated canvaskit files
mdebbar Dec 21, 2022
533864a
Put toolchain close to target
mdebbar Dec 22, 2022
b59bf8c
remove extra toolchains
mdebbar Dec 22, 2022
0572533
remove extra import
mdebbar Dec 22, 2022
ea0e192
add canvaskit_lite to archive
mdebbar Dec 22, 2022
8783c22
fix local canvaskit path in tests
mdebbar Dec 22, 2022
0d34f98
Merge branch 'main' into ck_gn
mdebbar Dec 27, 2022
5cb2d24
add some guards using visibility and asserts
mdebbar Dec 28, 2022
098ee39
renames
mdebbar Jan 4, 2023
6551b11
Merge branch 'main' into ck_gn
mdebbar Jan 17, 2023
7fe057b
formatting
mdebbar Jan 17, 2023
3ea622c
rename mistake
mdebbar Jan 17, 2023
3ce4045
Add github issue to the TODO
mdebbar Jan 18, 2023
59e7fc8
Update buildroot sha
mdebbar Jan 19, 2023
f681283
Merge branch 'main' into ck_gn
mdebbar Jan 20, 2023
b15ae6e
clang-tidy error
mdebbar Jan 20, 2023
27434d0
Merge branch 'main' into ck_gn
mdebbar Jan 23, 2023
f2f0ba0
skip canvaskit targets when not needed
mdebbar Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tools/gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,6 @@ def to_gn_wasm_args(args, gn_args):
gn_args['skia_gl_standard'] = 'webgl'
gn_args['skia_enable_gpu'] = True
gn_args['skia_enable_sksl_tracing'] = False
gn_args['skia_use_icu'] = True
gn_args['icu_use_data_file'] = False
gn_args['skia_use_freetype'] = True
gn_args['skia_use_harfbuzz'] = True
Expand Down
13 changes: 13 additions & 0 deletions wasm/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# //flutter/BUILD.gn pulls in Flutter SDK dependencies which will crash
# when the target CPU is WASM.

import("//build/toolchain/wasm.gni")
import("//flutter/common/config.gni")

# This is the default target when building when the target CPU is WASM.
Expand All @@ -14,3 +15,15 @@ group("wasm") {
deps = [ "//flutter/web_sdk" ]
}
}

wasm_toolchain("canvaskit") {
extra_toolchain_args = {
skia_use_icu = true
}
}

wasm_toolchain("canvaskit_lite") {
extra_toolchain_args = {
skia_use_icu = false
}
}
7 changes: 4 additions & 3 deletions web_sdk/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,8 @@ if (!is_fuchsia) {
] + web_engine_libraries

if (build_canvaskit) {
deps += [ "//third_party/skia/modules/canvaskit" ]
deps +=
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would need to investigate more to make specific suggestions about how to guard the canvaskit toolchain definitions with visibility annotations or asserts, but one thing that will probably help in any case is putting the targets you want to build with those toolchains right next to the toolchain definitions, with comments saying not to use those toolchains for anything else.

So here, you'd depend on a group target, where the group has a public_deps on //third_party/skia/..., and the group target is in the same file as the toolchain definitions.

[ "//third_party/skia/modules/canvaskit(//flutter/wasm:canvaskit)" ]
}

# flutter_ddc_modules
Expand Down Expand Up @@ -602,11 +603,11 @@ if (!is_fuchsia) {
if (build_canvaskit) {
tmp_files += [
{
source = rebase_path("$root_out_dir/canvaskit.js")
source = rebase_path("$root_out_dir/canvaskit/canvaskit.js")
destination = "canvaskit/canvaskit.js"
},
{
source = rebase_path("$root_out_dir/canvaskit.wasm")
source = rebase_path("$root_out_dir/canvaskit/canvaskit.wasm")
destination = "canvaskit/canvaskit.wasm"
},
]
Expand Down