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

Build platform dills with unevaluated constants #37940

Merged
merged 8 commits into from
Nov 29, 2022
Merged

Build platform dills with unevaluated constants #37940

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b98c11
Build dart2js platform kernels with null environment.
eyebrowsoffire Nov 23, 2022
655e220
Null environment should be true.
eyebrowsoffire Nov 23, 2022
e9a45d7
More cleanup of gn steps.
eyebrowsoffire Nov 23, 2022
9257795
Merge branch 'main' into no_platform_defines
eyebrowsoffire Nov 23, 2022
1971432
Merge branch 'main' into no_platform_defines
eyebrowsoffire Nov 28, 2022
5c34185
Fix build steps.
eyebrowsoffire Nov 28, 2022
e325b82
Fix formatting.
eyebrowsoffire Nov 28, 2022
2af4d2c
Add links to the cleanup github issue.
eyebrowsoffire Nov 29, 2022
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
157 changes: 58 additions & 99 deletions web_sdk/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ web_engine_libraries = [
group("web_sdk") {
deps = [
":flutter_ddc_modules",
":flutter_legacy_platform_dills",
":flutter_web_platforms",
":flutter_platform_dills",
]

if (archive_flutter_web_sdk && !is_fuchsia) {
Expand Down Expand Up @@ -277,6 +276,9 @@ template("_compile_platform") {
} else {
args += [ "--no-summary-only" ]
}
if (defined(invoker.null_environment) && invoker.null_environment) {
args += [ "--null-environment" ]
}
args += [
"--target",
"${invoker.kernel_target}",
Expand Down Expand Up @@ -314,112 +316,71 @@ template("_compile_platform") {
"file:///" + rebase_path("$root_out_dir"),
]
}

if (defined(invoker.extra_args)) {
args += invoker.extra_args
}
}
}

# Compile the unsound DDC SDK's summary.
_compile_platform("flutter_dartdevc_kernel_sdk_outline") {
_compile_platform("flutter_dartdevc_kernel_sdk_outline_unsound") {
sound_null_safety = false
kernel_target = "ddc"
summary_only = true
output_dill = "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk.dill"
output_dill = "$root_out_dir/flutter_web_sdk/kernel/ddc_outline.dill"
}

# Compile the sound DDC SDK's summary.
_compile_platform("flutter_dartdevc_kernel_sdk_outline_sound") {
sound_null_safety = true
kernel_target = "ddc"
summary_only = true
output_dill =
"$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk_sound.dill"
output_dill = "$root_out_dir/flutter_web_sdk/kernel/ddc_outline_sound.dill"
}

group("flutter_legacy_platform_dills") {
public_deps = [
":flutter_dartdevc_kernel_sdk_outline",
":flutter_dartdevc_kernel_sdk_outline_sound",
]
_compile_platform("flutter_dart2js_kernel_sdk_full_unsound") {
sound_null_safety = false
kernel_target = "dart2js"
summary_only = false
output_dill =
"$root_out_dir/flutter_web_sdk/kernel/dart2js_platform_unsound.dill"
null_environment = true
}

template("_flutter_web_platform") {
assert(defined(invoker.output_dir),
"output_dir must be defined for $target_name")
assert(defined(invoker.use_skia),
"use_skia must be defined for $target_name")
assert(defined(invoker.auto_detect),
"auto_detect must be defined for $target_name")
_compile_platform("flutter_dart2js_kernel_sdk_full_sound") {
sound_null_safety = true
kernel_target = "dart2js"
summary_only = false
output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2js_platform.dill"
null_environment = true
}

define_flags = [
"-DFLUTTER_WEB_USE_SKIA=${invoker.use_skia}",
"-DFLUTTER_WEB_AUTO_DETECT=${invoker.auto_detect}",
]
# 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")

_compile_platform("${target_name}_ddc_sound") {
sound_null_safety = true
kernel_target = "ddc"
summary_only = true
output_dill = "${invoker.output_dir}/ddc_outline_sound.dill"
extra_args = define_flags
}
_compile_platform("${target_name}_ddc_unsound") {
sound_null_safety = false
kernel_target = "ddc"
summary_only = true
output_dill = "${invoker.output_dir}/ddc_outline.dill"
extra_args = define_flags
}
_compile_platform("${target_name}_dart2js_sound") {
sound_null_safety = true
kernel_target = "dart2js"
summary_only = false
output_dill = "${invoker.output_dir}/dart2js_platform.dill"
extra_args = define_flags
}
_compile_platform("${target_name}_dart2js_unsound") {
sound_null_safety = false
kernel_target = "dart2js"
summary_only = false
output_dill = "${invoker.output_dir}/dart2js_platform_unsound.dill"
extra_args = define_flags
}
outputs = [ "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk.dill" ]

group(target_name) {
public_deps = [
":${target_name}_dart2js_sound",
":${target_name}_dart2js_unsound",
":${target_name}_ddc_sound",
":${target_name}_ddc_unsound",
]
}
deps = [ ":flutter_dartdevc_kernel_sdk_outline_unsound" ]
}

_flutter_web_platform("flutter_auto_platform") {
output_dir = "$root_out_dir/flutter_web_sdk/kernel/platforms/auto"
use_skia = true
auto_detect = true
}
copy("flutter_dartdevc_kernel_sdk_outline_sound_legacy") {
sources = get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound")

_flutter_web_platform("flutter_html_platform") {
output_dir = "$root_out_dir/flutter_web_sdk/kernel/platforms/html"
use_skia = false
auto_detect = false
}
outputs =
[ "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk_sound.dill" ]

_flutter_web_platform("flutter_canvaskit_platform") {
output_dir = "$root_out_dir/flutter_web_sdk/kernel/platforms/canvaskit"
use_skia = true
auto_detect = false
deps = [ ":flutter_dartdevc_kernel_sdk_outline_sound" ]
}

group("flutter_web_platforms") {
group("flutter_platform_dills") {
public_deps = [
":flutter_auto_platform",
":flutter_canvaskit_platform",
":flutter_html_platform",
":flutter_dart2js_kernel_sdk_full_sound",
":flutter_dart2js_kernel_sdk_full_unsound",
":flutter_dartdevc_kernel_sdk_outline_sound",
":flutter_dartdevc_kernel_sdk_outline_unsound",

# TODO(jacksongardner): remove these once they are no longer used by the flutter tool
# https://github.com/flutter/flutter/issues/113303
":flutter_dartdevc_kernel_sdk_outline_sound",
":flutter_dartdevc_kernel_sdk_outline_unsound",
]
}

Expand Down Expand Up @@ -561,6 +522,11 @@ group("flutter_ddc_modules") {
":flutter_dartdevc_canvaskit_kernel_sdk_sound",
":flutter_dartdevc_kernel_sdk",
":flutter_dartdevc_kernel_sdk_sound",

# TODO(jacksongardner): remove these once they are no longer used by the flutter tool
# https://github.com/flutter/flutter/issues/113303
":flutter_dartdevc_kernel_sdk_outline_sound_legacy",
":flutter_dartdevc_kernel_sdk_outline_unsound_legacy",
]
}

Expand All @@ -577,8 +543,7 @@ if (!is_fuchsia) {
}
deps = [
":flutter_ddc_modules",
":flutter_legacy_platform_dills",
":flutter_web_platforms",
":flutter_platform_dills",
] + web_engine_libraries

if (build_canvaskit) {
Expand All @@ -595,25 +560,19 @@ if (!is_fuchsia) {
sources +=
get_target_outputs(":flutter_dartdevc_canvaskit_html_kernel_sdk_sound")

# flutter_legacy_platform_dills
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline")
# flutter_platform_dills
sources +=
get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_unsound")
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")

# flutter_web_platforms
sources += get_target_outputs(":flutter_auto_platform_ddc_sound")
sources += get_target_outputs(":flutter_auto_platform_ddc_unsound")
sources += get_target_outputs(":flutter_auto_platform_dart2js_sound")
sources += get_target_outputs(":flutter_auto_platform_dart2js_unsound")

sources += get_target_outputs(":flutter_html_platform_ddc_sound")
sources += get_target_outputs(":flutter_html_platform_ddc_unsound")
sources += get_target_outputs(":flutter_html_platform_dart2js_sound")
sources += get_target_outputs(":flutter_html_platform_dart2js_unsound")

sources += get_target_outputs(":flutter_canvaskit_platform_ddc_sound")
sources += get_target_outputs(":flutter_canvaskit_platform_ddc_unsound")
sources += get_target_outputs(":flutter_canvaskit_platform_dart2js_sound")
sources += get_target_outputs(":flutter_canvaskit_platform_dart2js_unsound")
# TODO(jacksongardner): remove these once they are no longer used by the flutter tool
# https://github.com/flutter/flutter/issues/113303
sources += get_target_outputs(
":flutter_dartdevc_kernel_sdk_outline_unsound_legacy")
sources +=
get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound_legacy")

foreach(web_engine_library, web_engine_libraries) {
sources += get_target_outputs(web_engine_library)
Expand Down