From d05eb12e4dcc235fdd7b2fdd4e49e67c4dc10589 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Tue, 13 Sep 2022 10:45:52 -0700 Subject: [PATCH 1/3] Override the top level default target in the case of WASM. --- BUILD.gn | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index be3af57868..3b54881ef6 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -4,15 +4,27 @@ group("default") { testonly = true - deps = [ - "//flutter", - ] + if (target_os == "wasm") { + deps = [ + "//flutter/web_sdk/wasm:wasm_artifacts" + ] + } else { + deps = [ + "//flutter", + ] + } } group("dist") { testonly = true - deps = [ - "//flutter:dist", - ] + if (target_os == "wasm") { + deps = [ + "//flutter/web_sdk/wasm:wasm_artifacts" + ] + } else { + deps = [ + "//flutter:dist", + ] + } } From b8ccde4d187af1e5e421406bf06c8af52210c75e Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Tue, 13 Sep 2022 12:51:14 -0700 Subject: [PATCH 2/3] Move WASM build rules to top level --- BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 3b54881ef6..d5e07c16fe 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -6,7 +6,7 @@ group("default") { testonly = true if (target_os == "wasm") { deps = [ - "//flutter/web_sdk/wasm:wasm_artifacts" + "//flutter/wasm:wasm_artifacts" ] } else { deps = [ @@ -20,7 +20,7 @@ group("dist") { if (target_os == "wasm") { deps = [ - "//flutter/web_sdk/wasm:wasm_artifacts" + "//flutter/wasm:wasm_artifacts" ] } else { deps = [ From b5785a387659effccf4a7f95cc97ad690b4cbdfb Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Tue, 13 Sep 2022 14:01:02 -0700 Subject: [PATCH 3/3] Rename wasm_artifacts to wasm for a clean label --- BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index d5e07c16fe..1dd2324721 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -6,7 +6,7 @@ group("default") { testonly = true if (target_os == "wasm") { deps = [ - "//flutter/wasm:wasm_artifacts" + "//flutter/wasm" ] } else { deps = [ @@ -20,7 +20,7 @@ group("dist") { if (target_os == "wasm") { deps = [ - "//flutter/wasm:wasm_artifacts" + "//flutter/wasm" ] } else { deps = [