From 12f968e369f23ba6600fd6c90d792babdbe37e9b Mon Sep 17 00:00:00 2001 From: Jackson Gardner Date: Thu, 6 Apr 2023 16:04:59 -0700 Subject: [PATCH] Don't build wasm targets for the web sdk archive in host mode. (flutter/engine#40967) Don't build wasm targets for the web sdk archive in host mode. --- engine/src/flutter/web_sdk/BUILD.gn | 31 ++++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/engine/src/flutter/web_sdk/BUILD.gn b/engine/src/flutter/web_sdk/BUILD.gn index 5748476dd39..5cff1995de6 100644 --- a/engine/src/flutter/web_sdk/BUILD.gn +++ b/engine/src/flutter/web_sdk/BUILD.gn @@ -574,11 +574,16 @@ if (!is_fuchsia) { deps = [ ":flutter_ddc_modules", ":flutter_platform_dills", - "//flutter/third_party/canvaskit:canvaskit_group", - "//flutter/third_party/canvaskit:canvaskit_chromium_group", - "//flutter/third_party/canvaskit:skwasm_group", ] + web_engine_libraries + if (is_wasm) { + deps += [ + "//flutter/third_party/canvaskit:canvaskit_chromium_group", + "//flutter/third_party/canvaskit:canvaskit_group", + "//flutter/third_party/canvaskit:skwasm_group", + ] + } + # flutter_ddc_modules sources = get_target_outputs(":flutter_dartdevc_kernel_sdk") sources += get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk") @@ -595,15 +600,17 @@ if (!is_fuchsia) { 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") - sources += [ - "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js", - "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.wasm", - "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.js", - "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.wasm", - "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.js", - "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.wasm", - "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.worker.js", - ] + if (is_wasm) { + sources += [ + "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js", + "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.wasm", + "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.js", + "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.wasm", + "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.js", + "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.wasm", + "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.worker.js", + ] + } # TODO(jacksongardner): remove these once they are no longer used by the flutter tool # https://github.com/flutter/flutter/issues/113303