Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile a platform dill for dart2wasm #45797

Merged
merged 1 commit into from
Sep 13, 2023
Merged
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion web_sdk/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,11 @@ template("_compile_platform") {
if (defined(invoker.null_environment) && invoker.null_environment) {
args += [ "--null-environment" ]
}
skwasm_library = "dart:_skwasm_stub"
if (invoker.kernel_target == "dart2wasm") {
skwasm_library = "dart:_skwasm_impl"
}

args += [
"--target",
"${invoker.kernel_target}",
Expand All @@ -253,7 +258,7 @@ template("_compile_platform") {
"--source",
"dart:_engine",
"--source",
"dart:_skwasm_stub",
skwasm_library,
"--source",
"dart:_web_unicode",
"--source",
Expand Down Expand Up @@ -306,6 +311,14 @@ _compile_platform("flutter_dart2js_kernel_sdk_full_sound") {
null_environment = true
}

_compile_platform("flutter_dart2wasm_kernel_sdk_full_sound") {
sound_null_safety = true
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we still need to spell it out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, insofar as I need to pass it as a parameter to kernel_worker

kernel_target = "dart2wasm"
summary_only = false
output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2wasm_platform.dill"
null_environment = true
}

# TODO(jacksongardner): remove these once they are no longer used by the flutter tool
copy("flutter_dartdevc_kernel_sdk_outline_unsound_legacy") {
sources = get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_unsound")
Expand All @@ -328,6 +341,7 @@ group("flutter_platform_dills") {
public_deps = [
":flutter_dart2js_kernel_sdk_full_sound",
":flutter_dart2js_kernel_sdk_full_unsound",
":flutter_dart2wasm_kernel_sdk_full_sound",
":flutter_dartdevc_kernel_sdk_outline_sound",
":flutter_dartdevc_kernel_sdk_outline_unsound",

Expand Down Expand Up @@ -528,6 +542,7 @@ if (!is_fuchsia) {
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound")
sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_unsound")
sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_sound")
sources += get_target_outputs(":flutter_dart2wasm_kernel_sdk_full_sound")
if (is_wasm) {
sources += [
"$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js",
Expand Down