@@ -204,8 +204,6 @@ template("_kernel_worker") {
204
204
}
205
205
206
206
template (" _compile_platform" ) {
207
- assert (defined (invoker .sound_null_safety ),
208
- " sound_null_safety must be defined for $target_name " )
209
207
assert (defined (invoker .kernel_target ),
210
208
" kernel_target must be defined for $target_name " )
211
209
assert (defined (invoker .summary_only ),
@@ -216,12 +214,7 @@ template("_compile_platform") {
216
214
inputs = [ " sdk_rewriter.dart" ] + web_ui_sources
217
215
218
216
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 = []
225
218
226
219
if (invoker .summary_only ) {
227
220
args += [ " --summary-only" ]
@@ -280,41 +273,20 @@ template("_compile_platform") {
280
273
}
281
274
}
282
275
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" ) {
286
277
kernel_target = " ddc"
287
278
summary_only = true
288
279
output_dill = " $root_out_dir /flutter_web_sdk/kernel/ddc_outline.dill"
289
280
}
290
281
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" ) {
310
283
kernel_target = " dart2js"
311
284
summary_only = false
312
285
output_dill = " $root_out_dir /flutter_web_sdk/kernel/dart2js_platform.dill"
313
286
null_environment = true
314
287
}
315
288
316
- _compile_platform (" flutter_dart2wasm_kernel_sdk_full_sound" ) {
317
- sound_null_safety = true
289
+ _compile_platform (" flutter_dart2wasm_kernel_sdk_full" ) {
318
290
kernel_target = " dart2wasm"
319
291
summary_only = false
320
292
output_dill = " $root_out_dir /flutter_web_sdk/kernel/dart2wasm_platform.dill"
@@ -323,22 +295,14 @@ _compile_platform("flutter_dart2wasm_kernel_sdk_full_sound") {
323
295
324
296
group (" flutter_platform_dills" ) {
325
297
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" ,
336
302
]
337
303
}
338
304
339
305
template (" _compile_ddc_module" ) {
340
- assert (defined (invoker .sound_null_safety ),
341
- " sound_null_safety must be defined for $target_name " )
342
306
assert (defined (invoker .sdk_path_prefix ),
343
307
" sdk_path_prefix must be defined for $target_name " )
344
308
assert (defined (invoker .module_format ),
@@ -351,9 +315,6 @@ template("_compile_ddc_module") {
351
315
packages = dart_sdk_package_config
352
316
353
317
name_suffix = " -canvaskit"
354
- if (invoker .sound_null_safety ) {
355
- name_suffix += " -sound"
356
- }
357
318
358
319
dart_sdk_js_path = " $root_out_dir /flutter_web_sdk/kernel/${ invoker.sdk_path_prefix } ${ name_suffix } /dart_sdk.js"
359
320
@@ -362,13 +323,7 @@ template("_compile_ddc_module") {
362
323
dart_sdk_js_path + " .map" ,
363
324
]
364
325
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 = [
372
327
" --compile-sdk" ,
373
328
" dart:core" ,
374
329
@@ -415,8 +370,6 @@ template("_compile_ddc_module") {
415
370
}
416
371
417
372
template (" _compile_ddc_modules" ) {
418
- assert (defined (invoker .sound_null_safety ),
419
- " sound_null_safety must be defined for $target_name " )
420
373
forward_variables_from (invoker , " *" )
421
374
422
375
# We compile multiple times instead of passing multiple modules to a single
@@ -428,31 +381,22 @@ template("_compile_ddc_modules") {
428
381
canary = false
429
382
}
430
383
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
438
388
}
439
389
}
440
390
441
- # Compiles the unsound canvaskit only renderer.
391
+ # Compiles the canvaskit only renderer.
442
392
_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
449
393
}
450
394
451
395
group (" flutter_ddc_modules" ) {
452
396
public_deps = [
453
397
" :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 " ,
456
400
]
457
401
}
458
402
@@ -477,18 +421,14 @@ if (!is_fuchsia) {
477
421
478
422
# flutter_ddc_modules
479
423
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" )
482
425
sources += get_target_outputs (
483
- " :flutter_dartdevc_canvaskit_kernel_sdk_sound_ddcLibraryBundle " )
426
+ " :flutter_dartdevc_canvaskit_kernel_sdk_ddcLibraryBundle " )
484
427
485
428
# 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" )
492
432
if (is_wasm ) {
493
433
sources += [
494
434
" $root_out_dir /flutter_web_sdk/canvaskit/canvaskit.js" ,
0 commit comments