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

[null-safety] updated rules to build sound dill/SDKs for web #19162

Closed
jonahwilliams wants to merge 11 commits into from
Closed

[null-safety] updated rules to build sound dill/SDKs for web #19162

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fcd5146
[null-safety] rules for web
Jun 19, 2020
6441329
Update BUILD.gn
Jun 19, 2020
8a2b7df
fix formatting
Jun 19, 2020
a4d7838
minor renames
Jun 19, 2020
c0dc35c
Merge branch 'master' of github.com:flutter/engine into add_compilati…
Jun 26, 2020
824dd64
update now that _engine is ready
Jun 26, 2020
ea587fa
remove K
Jun 26, 2020
e4507cf
Remove deps
Jun 26, 2020
271a45b
did this get deleted
Jun 26, 2020
6676542
copy paste
Jun 26, 2020
23d9524
Merge branch 'master' of github.com:flutter/engine into add_compilati…
Jun 27, 2020
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
162 changes: 162 additions & 0 deletions web_sdk/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import("//third_party/dart/build/dart/dart_action.gni")
import("//third_party/dart/utils/compile_platform.gni")

sdk_dill = "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk.dill"
sdk_dill_strong =
"$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk_strong.dill"

@nshahan nshahan Jun 19, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: Rename to mirror the names used in the sdk: I'm in the process of renaming to be more consistent with other tools and avoid confusion between the full and outline dills.

flutter_ddc_outline.dill <-- (weak)
flutter_ddc_outline_sound.dill <-- (strong)

@jonahwilliams jonahwilliams Jun 19, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm going to leave any renames for later, we'd likely need to upload both though to google3 so all tools could update


web_ui_sources = exec_script("//third_party/dart/tools/list_dart_files.py",
[
Expand All @@ -29,8 +31,11 @@ web_engine_sources += [ "//flutter/lib/web_ui/lib/src/engine.dart" ]
group("web_sdk") {
deps = [
":flutter_dartdevc_canvaskit_kernel_sdk",
":flutter_dartdevc_canvaskit_kernel_sdk_strong",
":flutter_dartdevc_kernel_sdk",
":flutter_dartdevc_kernel_sdk_outline",
":flutter_dartdevc_kernel_sdk_outline_strong",
":flutter_dartdevc_kernel_sdk_strong",
":web_engine_sources",
":web_ui_library",
":web_ui_sources",
Expand Down Expand Up @@ -244,3 +249,160 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk") {
"$root_out_dir/flutter_web_sdk/kernel/legacy-canvaskit/dart_sdk.js"),
]
}

# Compiles the DDC CanvasKit SDK's JS code for null safety.
prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk_strong") {

@nshahan nshahan Jun 19, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: not a big deal but we've committed to the term "sound" going forward so I've been trying to use it everywhere we were saying "strong".

@jonahwilliams jonahwilliams Jun 19, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That SGTM, turns out we're still using strong in some places from the Dart 2 migration

deps = [
":flutter_dartdevc_kernel_sdk_outline_strong",
"//third_party/dart:create_sdk",
"//third_party/dart/pkg:pkg_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
]

inputs = [ "sdk_rewriter.dart" ] + web_ui_sources + web_engine_sources

packages = "//third_party/dart/.packages"

script = "//third_party/dart/pkg/dev_compiler/bin/dartdevc.dart"

outputs = [
"$root_out_dir/flutter_web_sdk/kernel/amd-canvaskit-strong/dart_sdk.js",
"$root_out_dir/flutter_web_sdk/kernel/amd-canvaskit-strong/dart_sdk.js.map",
]

args = [
"--enable-experiment=non-nullable",
"--sound-null-safety",
"-k",

@nshahan nshahan Jun 19, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: -k is no longer needed and is ignored.

@jonahwilliams jonahwilliams Jun 26, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

k removed

@nshahan nshahan Jun 26, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👆 I see what you did there.

"--compile-sdk",
"dart:core",

# Additional Flutter web dart libraries
"dart:ui",
"dart:_engine",
"--no-summarize",
"--packages",
"file:///" + rebase_path("//third_party/dart/.packages"),
"--multi-root-scheme",
"org-dartlang-sdk",
"--multi-root",
"file:///" + rebase_path("$root_out_dir"),
"--multi-root-output-path",
rebase_path("$root_out_dir/"),
"--libraries-file",
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--inline-source-map",
"-DFLUTTER_WEB_USE_SKIA=true",
"--modules",
"amd",
"-o",
rebase_path(
"$root_out_dir/flutter_web_sdk/kernel/amd-canvaskit-strong/dart_sdk.js"),
"--modules",
"legacy",
"-o",
rebase_path(
"$root_out_dir/flutter_web_sdk/kernel/legacy-canvaskit-strong/dart_sdk.js"),
rebase_path(sdk_dill_strong),
]
}

# Compiles the DDC SDK's JS code for null safety.
prebuilt_dart_action("flutter_dartdevc_kernel_sdk_strong") {
deps = [
":flutter_dartdevc_kernel_sdk_outline_strong",
"//third_party/dart:create_sdk",
"//third_party/dart/pkg:pkg_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
]

inputs = [ "sdk_rewriter.dart" ] + web_ui_sources + web_engine_sources

packages = "//third_party/dart/.packages"

script = "//third_party/dart/pkg/dev_compiler/bin/dartdevc.dart"

outputs = [
"$root_out_dir/flutter_web_sdk/kernel/amd-strong/dart_sdk.js",
"$root_out_dir/flutter_web_sdk/kernel/amd-strong/dart_sdk.js.map",
]

args = [
"--enable-experiment=non-nullable",
"--sound-null-safety",
"-k",

@nshahan nshahan Jun 19, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ditto

@jonahwilliams jonahwilliams Jun 26, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done

"--compile-sdk",
"dart:core",

# Additional Flutter web dart libraries
"dart:ui",
"dart:_engine",
"--no-summarize",
"--packages",
"file:///" + rebase_path("//third_party/dart/.packages"),
"--multi-root-scheme",
"org-dartlang-sdk",
"--multi-root",
"file:///" + rebase_path("$root_out_dir"),
"--multi-root-output-path",
rebase_path("$root_out_dir/"),
"--libraries-file",
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--inline-source-map",
"--modules",
"amd",
"-o",
rebase_path("$root_out_dir/flutter_web_sdk/kernel/amd-strong/dart_sdk.js"),
"--modules",
"legacy",
"-o",
rebase_path(
"$root_out_dir/flutter_web_sdk/kernel/legacy-strong/dart_sdk.js"),
]
}

# Compile the DDC SDK's summary.
prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline_strong") {
deps = [
"//third_party/dart:create_sdk",
"//third_party/dart/pkg:pkg_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
]

inputs = [ "sdk_rewriter.dart" ] + web_ui_sources + web_engine_sources

outputs = [
sdk_dill_strong,
]

script = "//third_party/dart/utils/bazel/kernel_worker.dart"

args = [
"--enable-experiment=non-nullable",
"--sound-null-safety ",

@nshahan nshahan Jun 19, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm not familiar with the kernel_worker.dart script and I'm not using it when I build the .dill files in the sdk build target. Does it already support the --sound-null-safety flag? I didn't see it in the args in a quick search.

@jonahwilliams jonahwilliams Jun 19, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I thought It worked locally but I might have missed some flags. At any rate, everything still fails when compiling, I'll double check what dart_sdk is doing and update though

@jonahwilliams jonahwilliams Jun 26, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

everything seems to work OK

"--summary-only",
"--target",
"ddc",
"--packages-file",
"file:///" + rebase_path("//third_party/dart/.packages"),
"--multi-root-scheme",
"org-dartlang-sdk",
"--multi-root",
"file:///" + rebase_path("$root_out_dir"),
"--libraries-file",
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--output",
rebase_path(sdk_dill_strong),
"--source",
"dart:core",

# Additional Flutter web dart libraries
"--source",
"dart:ui",
"--source",
"dart:_engine",
]
}