Skip to content

Commit b728c4c

Browse files
authored
Remove unsound artifacts, remove *Sound qualifier. (flutter#163015)
Towards flutter#162846. Removes all of the unsound host artifacts, and then uses their name for the sound artifacts. That is, for something like `webPlatformDDCKernelDill`, this PR: - Changes the web GN builders to only emit the sound SDK, without the `-sound` suffixes - Deletes `webPlatformDDCKernelDill` and all usages of it (implicitly unsound, and unused). - Renames `webPlatformDDCKernelSoundDill` to `webPlatformDDCKernelDill`. No user impact expected, as there was no way to use the unsound artifacts from the Flutter tool.
1 parent 8c843aa commit b728c4c

File tree

11 files changed

+116
-340
lines changed

11 files changed

+116
-340
lines changed

engine/src/flutter/web_sdk/BUILD.gn

Lines changed: 21 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,6 @@ template("_kernel_worker") {
204204
}
205205

206206
template("_compile_platform") {
207-
assert(defined(invoker.sound_null_safety),
208-
"sound_null_safety must be defined for $target_name")
209207
assert(defined(invoker.kernel_target),
210208
"kernel_target must be defined for $target_name")
211209
assert(defined(invoker.summary_only),
@@ -216,12 +214,7 @@ template("_compile_platform") {
216214
inputs = [ "sdk_rewriter.dart" ] + web_ui_sources
217215

218216
outputs = [ invoker.output_dill ]
219-
220-
if (invoker.sound_null_safety) {
221-
args = [ "--sound-null-safety" ]
222-
} else {
223-
args = [ "--no-sound-null-safety" ]
224-
}
217+
args = []
225218

226219
if (invoker.summary_only) {
227220
args += [ "--summary-only" ]
@@ -280,41 +273,20 @@ template("_compile_platform") {
280273
}
281274
}
282275

283-
# Compile the unsound DDC SDK's summary.
284-
_compile_platform("flutter_dartdevc_kernel_sdk_outline_unsound") {
285-
sound_null_safety = false
276+
_compile_platform("flutter_dartdevc_kernel_sdk_outline") {
286277
kernel_target = "ddc"
287278
summary_only = true
288279
output_dill = "$root_out_dir/flutter_web_sdk/kernel/ddc_outline.dill"
289280
}
290281

291-
# Compile the sound DDC SDK's summary.
292-
_compile_platform("flutter_dartdevc_kernel_sdk_outline_sound") {
293-
sound_null_safety = true
294-
kernel_target = "ddc"
295-
summary_only = true
296-
output_dill = "$root_out_dir/flutter_web_sdk/kernel/ddc_outline_sound.dill"
297-
}
298-
299-
_compile_platform("flutter_dart2js_kernel_sdk_full_unsound") {
300-
sound_null_safety = false
301-
kernel_target = "dart2js"
302-
summary_only = false
303-
output_dill =
304-
"$root_out_dir/flutter_web_sdk/kernel/dart2js_platform_unsound.dill"
305-
null_environment = true
306-
}
307-
308-
_compile_platform("flutter_dart2js_kernel_sdk_full_sound") {
309-
sound_null_safety = true
282+
_compile_platform("flutter_dart2js_kernel_sdk_full") {
310283
kernel_target = "dart2js"
311284
summary_only = false
312285
output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2js_platform.dill"
313286
null_environment = true
314287
}
315288

316-
_compile_platform("flutter_dart2wasm_kernel_sdk_full_sound") {
317-
sound_null_safety = true
289+
_compile_platform("flutter_dart2wasm_kernel_sdk_full") {
318290
kernel_target = "dart2wasm"
319291
summary_only = false
320292
output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2wasm_platform.dill"
@@ -323,22 +295,14 @@ _compile_platform("flutter_dart2wasm_kernel_sdk_full_sound") {
323295

324296
group("flutter_platform_dills") {
325297
public_deps = [
326-
":flutter_dart2js_kernel_sdk_full_sound",
327-
":flutter_dart2js_kernel_sdk_full_unsound",
328-
":flutter_dart2wasm_kernel_sdk_full_sound",
329-
":flutter_dartdevc_kernel_sdk_outline_sound",
330-
":flutter_dartdevc_kernel_sdk_outline_unsound",
331-
332-
# TODO(jacksongardner): remove these once they are no longer used by the flutter tool
333-
# https://github.com/flutter/flutter/issues/113303
334-
":flutter_dartdevc_kernel_sdk_outline_sound",
335-
":flutter_dartdevc_kernel_sdk_outline_unsound",
298+
":flutter_dart2js_kernel_sdk_full",
299+
":flutter_dart2wasm_kernel_sdk_full",
300+
":flutter_dartdevc_kernel_sdk_outline",
301+
":flutter_dartdevc_kernel_sdk_outline",
336302
]
337303
}
338304

339305
template("_compile_ddc_module") {
340-
assert(defined(invoker.sound_null_safety),
341-
"sound_null_safety must be defined for $target_name")
342306
assert(defined(invoker.sdk_path_prefix),
343307
"sdk_path_prefix must be defined for $target_name")
344308
assert(defined(invoker.module_format),
@@ -351,9 +315,6 @@ template("_compile_ddc_module") {
351315
packages = dart_sdk_package_config
352316

353317
name_suffix = "-canvaskit"
354-
if (invoker.sound_null_safety) {
355-
name_suffix += "-sound"
356-
}
357318

358319
dart_sdk_js_path = "$root_out_dir/flutter_web_sdk/kernel/${invoker.sdk_path_prefix}${name_suffix}/dart_sdk.js"
359320

@@ -362,13 +323,7 @@ template("_compile_ddc_module") {
362323
dart_sdk_js_path + ".map",
363324
]
364325

365-
if (invoker.sound_null_safety) {
366-
args = [ "--sound-null-safety" ]
367-
} else {
368-
args = [ "--no-sound-null-safety" ]
369-
}
370-
371-
args += [
326+
args = [
372327
"--compile-sdk",
373328
"dart:core",
374329

@@ -415,8 +370,6 @@ template("_compile_ddc_module") {
415370
}
416371

417372
template("_compile_ddc_modules") {
418-
assert(defined(invoker.sound_null_safety),
419-
"sound_null_safety must be defined for $target_name")
420373
forward_variables_from(invoker, "*")
421374

422375
# We compile multiple times instead of passing multiple modules to a single
@@ -428,31 +381,22 @@ template("_compile_ddc_modules") {
428381
canary = false
429382
}
430383

431-
# No support for unsound null safety with the DDC library bundle format.
432-
if (sound_null_safety) {
433-
_compile_ddc_module("${target_name}_ddcLibraryBundle") {
434-
sdk_path_prefix = "ddcLibraryBundle"
435-
module_format = "ddc"
436-
canary = true
437-
}
384+
_compile_ddc_module("${target_name}_ddcLibraryBundle") {
385+
sdk_path_prefix = "ddcLibraryBundle"
386+
module_format = "ddc"
387+
canary = true
438388
}
439389
}
440390

441-
# Compiles the unsound canvaskit only renderer.
391+
# Compiles the canvaskit only renderer.
442392
_compile_ddc_modules("flutter_dartdevc_canvaskit_kernel_sdk") {
443-
sound_null_safety = false
444-
}
445-
446-
# Compiles the sound canvaskit only renderer.
447-
_compile_ddc_modules("flutter_dartdevc_canvaskit_kernel_sdk_sound") {
448-
sound_null_safety = true
449393
}
450394

451395
group("flutter_ddc_modules") {
452396
public_deps = [
453397
":flutter_dartdevc_canvaskit_kernel_sdk_amd",
454-
":flutter_dartdevc_canvaskit_kernel_sdk_sound_amd",
455-
":flutter_dartdevc_canvaskit_kernel_sdk_sound_ddcLibraryBundle",
398+
":flutter_dartdevc_canvaskit_kernel_sdk_amd",
399+
":flutter_dartdevc_canvaskit_kernel_sdk_ddcLibraryBundle",
456400
]
457401
}
458402

@@ -477,18 +421,14 @@ if (!is_fuchsia) {
477421

478422
# flutter_ddc_modules
479423
sources = get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_amd")
480-
sources +=
481-
get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_sound_amd")
424+
sources += get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_amd")
482425
sources += get_target_outputs(
483-
":flutter_dartdevc_canvaskit_kernel_sdk_sound_ddcLibraryBundle")
426+
":flutter_dartdevc_canvaskit_kernel_sdk_ddcLibraryBundle")
484427

485428
# flutter_platform_dills
486-
sources +=
487-
get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_unsound")
488-
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound")
489-
sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_unsound")
490-
sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_sound")
491-
sources += get_target_outputs(":flutter_dart2wasm_kernel_sdk_full_sound")
429+
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline")
430+
sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full")
431+
sources += get_target_outputs(":flutter_dart2wasm_kernel_sdk_full")
492432
if (is_wasm) {
493433
sources += [
494434
"$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js",

0 commit comments

Comments
 (0)