@@ -339,9 +339,6 @@ group("flutter_platform_dills") {
339
339
template (" _compile_ddc_module" ) {
340
340
assert (defined (invoker .sound_null_safety ),
341
341
" sound_null_safety must be defined for $target_name " )
342
- assert (defined (invoker .use_skia ), " use_skia must be defined for $target_name " )
343
- assert (defined (invoker .auto_detect ),
344
- " auto_detect must be defined for $target_name " )
345
342
assert (defined (invoker .sdk_path_prefix ),
346
343
" sdk_path_prefix must be defined for $target_name " )
347
344
assert (defined (invoker .module_format ),
@@ -353,13 +350,7 @@ template("_compile_ddc_module") {
353
350
354
351
packages = dart_sdk_package_config
355
352
356
- name_suffix = " "
357
- if (invoker .use_skia ) {
358
- name_suffix += " -canvaskit"
359
- }
360
- if (invoker .auto_detect ) {
361
- name_suffix += " -html"
362
- }
353
+ name_suffix = " -canvaskit"
363
354
if (invoker .sound_null_safety ) {
364
355
name_suffix += " -sound"
365
356
}
@@ -400,8 +391,7 @@ template("_compile_ddc_module") {
400
391
" --libraries-file" ,
401
392
" org-dartlang-sdk:///libraries.json" ,
402
393
" --inline-source-map" ,
403
- " -DFLUTTER_WEB_USE_SKIA=${ invoker.use_skia } " ,
404
- " -DFLUTTER_WEB_AUTO_DETECT=${ invoker.auto_detect } " ,
394
+ " -DFLUTTER_WEB_USE_SKIA=true" ,
405
395
" --modules" ,
406
396
invoker .module_format ,
407
397
" -o" ,
@@ -448,59 +438,21 @@ template("_compile_ddc_modules") {
448
438
}
449
439
}
450
440
451
- # Compiles the unsound html only renderer.
452
- _compile_ddc_modules (" flutter_dartdevc_kernel_sdk" ) {
453
- sound_null_safety = false
454
- use_skia = false
455
- auto_detect = false
456
- }
457
-
458
441
# Compiles the unsound canvaskit only renderer.
459
442
_compile_ddc_modules (" flutter_dartdevc_canvaskit_kernel_sdk" ) {
460
443
sound_null_safety = false
461
- use_skia = true
462
- auto_detect = false
463
- }
464
-
465
- # Compiles the unsound autodetect renderer.
466
- _compile_ddc_modules (" flutter_dartdevc_canvaskit_html_kernel_sdk" ) {
467
- sound_null_safety = false
468
- use_skia = true
469
- auto_detect = true
470
- }
471
-
472
- # Compiles the sound html only renderer.
473
- _compile_ddc_modules (" flutter_dartdevc_kernel_sdk_sound" ) {
474
- sound_null_safety = true
475
- use_skia = false
476
- auto_detect = false
477
444
}
478
445
479
446
# Compiles the sound canvaskit only renderer.
480
447
_compile_ddc_modules (" flutter_dartdevc_canvaskit_kernel_sdk_sound" ) {
481
448
sound_null_safety = true
482
- use_skia = true
483
- auto_detect = false
484
- }
485
-
486
- # Compiles the sound autodetect renderer.
487
- _compile_ddc_modules (" flutter_dartdevc_canvaskit_html_kernel_sdk_sound" ) {
488
- sound_null_safety = true
489
- use_skia = true
490
- auto_detect = true
491
449
}
492
450
493
451
group (" flutter_ddc_modules" ) {
494
452
public_deps = [
495
- " :flutter_dartdevc_canvaskit_html_kernel_sdk_amd" ,
496
- " :flutter_dartdevc_canvaskit_html_kernel_sdk_sound_amd" ,
497
- " :flutter_dartdevc_canvaskit_html_kernel_sdk_sound_ddcLibraryBundle" ,
498
453
" :flutter_dartdevc_canvaskit_kernel_sdk_amd" ,
499
454
" :flutter_dartdevc_canvaskit_kernel_sdk_sound_amd" ,
500
455
" :flutter_dartdevc_canvaskit_kernel_sdk_sound_ddcLibraryBundle" ,
501
- " :flutter_dartdevc_kernel_sdk_amd" ,
502
- " :flutter_dartdevc_kernel_sdk_sound_amd" ,
503
- " :flutter_dartdevc_kernel_sdk_sound_ddcLibraryBundle" ,
504
456
]
505
457
}
506
458
@@ -524,21 +476,11 @@ if (!is_fuchsia) {
524
476
deps += [ " //flutter/lib/web_ui/flutter_js" ]
525
477
526
478
# flutter_ddc_modules
527
- sources = get_target_outputs (" :flutter_dartdevc_kernel_sdk_amd" )
528
- sources += get_target_outputs (" :flutter_dartdevc_canvaskit_kernel_sdk_amd" )
529
- sources +=
530
- get_target_outputs (" :flutter_dartdevc_canvaskit_html_kernel_sdk_amd" )
531
- sources += get_target_outputs (" :flutter_dartdevc_kernel_sdk_sound_amd" )
479
+ sources = get_target_outputs (" :flutter_dartdevc_canvaskit_kernel_sdk_amd" )
532
480
sources +=
533
481
get_target_outputs (" :flutter_dartdevc_canvaskit_kernel_sdk_sound_amd" )
534
- sources += get_target_outputs (
535
- " :flutter_dartdevc_canvaskit_html_kernel_sdk_sound_amd" )
536
- sources += get_target_outputs (
537
- " :flutter_dartdevc_kernel_sdk_sound_ddcLibraryBundle" )
538
482
sources += get_target_outputs (
539
483
" :flutter_dartdevc_canvaskit_kernel_sdk_sound_ddcLibraryBundle" )
540
- sources += get_target_outputs (
541
- " :flutter_dartdevc_canvaskit_html_kernel_sdk_sound_ddcLibraryBundle" )
542
484
543
485
# flutter_platform_dills
544
486
sources +=
0 commit comments