Build web sdk in wasm tree.

Author: eyebrowsoffire

BUILD.gn

@@ -44,30 +44,6 @@ config("export_dynamic_symbols") {
   }
 }
 
-if (flutter_prebuilt_dart_sdk) {
-  copy_trees("_copy_trees") {
-    sources = [
-      {
-        target = "copy_dart_sdk"
-        visibility = [ ":dart_sdk" ]
-        source = prebuilt_dart_sdk
-        dest = "$root_out_dir/dart-sdk"
-        ignore_patterns = "{}"
-      },
-    ]
-  }
-}
-
-group("dart_sdk") {
-  if (build_engine_artifacts) {
-    if (flutter_prebuilt_dart_sdk) {
-      public_deps = [ ":copy_dart_sdk" ]
-    } else {
-      public_deps = [ "//third_party/dart:create_sdk" ]
-    }
-  }
-}
-
 group("flutter") {
   testonly = true
 
@@ -96,7 +72,7 @@ group("flutter") {
 
     if (build_engine_artifacts) {
       public_deps += [
-        ":dart_sdk",
+        "//flutter/dart_sdk",
         "//flutter/flutter_frontend_server:frontend_server",
 
         # This must be listed explicitly for desktop cross-builds since

common/config.gni

@@ -114,7 +114,7 @@ if (flutter_prebuilt_dart_sdk) {
   # There is no prebuilt Dart SDK targeting Fuchsia, but we also don't need
   # one, so even when the build is targeting Fuchsia, use the prebuilt
   # Dart SDK for the host.
-  if (current_toolchain == host_toolchain || is_fuchsia) {
+  if (current_toolchain == host_toolchain || is_fuchsia || is_wasm) {
     prebuilt_dart_sdk = host_prebuilt_dart_sdk
     prebuilt_dart_sdk_config = _host_prebuilt_dart_sdk_config
   } else {

dart_sdk/BUILD.gn

@@ -0,0 +1,22 @@
+import("//flutter/common/config.gni")
+import("//third_party/dart/build/dart/copy_tree.gni")
+
+copy_trees("_copy_trees") {
+  sources = [
+    {
+      target = "copy_dart_sdk"
+      visibility = [ ":dart_sdk" ]
+      source = prebuilt_dart_sdk
+      dest = "$root_out_dir/dart-sdk"
+      ignore_patterns = "{}"
+    },
+  ]
+}
+
+group("dart_sdk") {
+  if (flutter_prebuilt_dart_sdk) {
+    public_deps = [ ":copy_dart_sdk" ]
+  } else {
+    public_deps = [ "//third_party/dart:create_sdk" ]
+  }
+}

lib/web_ui/dev/build.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:io' show Directory, Platform;
+import 'dart:io' show Directory;
 
 import 'package:args/command_runner.dart';
 import 'package:path/path.dart' as path;
@@ -43,14 +43,8 @@ class BuildCommand extends Command<bool> with ArgUtils<bool> {
     final FilePath libPath = FilePath.fromWebUi('lib');
     final List<PipelineStep> steps = <PipelineStep>[
       GnPipelineStep(),
-      NinjaPipelineStep(target: environment.engineBuildDir),
+      NinjaPipelineStep(target: environment.wasmReleaseOutDir),
     ];
-    if (buildCanvasKit) {
-      steps.addAll(<PipelineStep>[
-        GnPipelineStep(target: 'canvaskit'),
-        NinjaPipelineStep(target: environment.wasmReleaseOutDir),
-      ]);
-    }
     final Pipeline buildPipeline = Pipeline(steps: steps);
     await buildPipeline.run();
 
@@ -73,39 +67,19 @@ class BuildCommand extends Command<bool> with ArgUtils<bool> {
 /// Not safe to interrupt as it may leave the `out/` directory in a corrupted
 /// state. GN is pretty quick though, so it's OK to not support interruption.
 class GnPipelineStep extends ProcessStep {
-  GnPipelineStep({this.target = 'engine'})
-      : assert(target == 'engine' || target == 'canvaskit');
-
   @override
   String get description => 'gn';
 
   @override
   bool get isSafeToInterrupt => false;
 
-  /// The target to build with gn.
-  ///
-  /// Acceptable values: engine, canvaskit
-  final String target;
-
   @override
   Future<ProcessManager> createProcess() {
-    print('Running gn for $target...');
-    final List<String> gnArgs = <String>[];
-    if (target == 'engine') {
-      gnArgs.addAll(<String>[
-        '--unopt',
-        if (Platform.isMacOS) '--xcode-symlinks',
-        '--full-dart-sdk',
-        if (environment.isMacosArm) '--mac-cpu=arm64',
-      ]);
-    } else if (target == 'canvaskit') {
-      gnArgs.addAll(<String>[
-        '--wasm',
-        '--runtime-mode=release',
-      ]);
-    } else {
-      throw StateError('Target was not engine or canvaskit: $target');
-    }
+    print('Running gn...');
+    const List<String> gnArgs = <String>[
+      '--wasm',
+      '--runtime-mode=release',
+    ];
     return startProcess(
       path.join(environment.flutterDirectory.path, 'tools', 'gn'),
       gnArgs,

lib/web_ui/dev/environment.dart

@@ -26,15 +26,10 @@ class Environment {
         io.Directory(pathlib.join(engineSrcDir.path, 'flutter', 'tools'));
     final io.Directory outDir =
         io.Directory(pathlib.join(engineSrcDir.path, 'out'));
-    final io.Directory engineBuildDir =
-        io.Directory(pathlib.join(
-          outDir.path,
-          isMacosArm ? 'host_debug_unopt_arm64' : 'host_debug_unopt'
-        ));
     final io.Directory wasmReleaseOutDir =
         io.Directory(pathlib.join(outDir.path, 'wasm_release'));
     final io.Directory dartSdkDir =
-        io.Directory(pathlib.join(engineBuildDir.path, 'dart-sdk'));
+        io.Directory(pathlib.join(wasmReleaseOutDir.path, 'dart-sdk'));
     final io.Directory webUiRootDir = io.Directory(
         pathlib.join(engineSrcDir.path, 'flutter', 'lib', 'web_ui'));
 
@@ -55,7 +50,6 @@ class Environment {
       engineSrcDir: engineSrcDir,
       engineToolsDir: engineToolsDir,
       outDir: outDir,
-      engineBuildDir: engineBuildDir,
       wasmReleaseOutDir: wasmReleaseOutDir,
       dartSdkDir: dartSdkDir,
     );
@@ -68,7 +62,6 @@ class Environment {
     required this.engineSrcDir,
     required this.engineToolsDir,
     required this.outDir,
-    required this.engineBuildDir,
     required this.wasmReleaseOutDir,
     required this.dartSdkDir,
   });
@@ -93,9 +86,6 @@ class Environment {
   /// This is where you'll find the ninja output, such as the Dart SDK.
   final io.Directory outDir;
 
-  /// The output directory for the host_debug_unopt build.
-  final io.Directory engineBuildDir;
-
   /// The output directory for the wasm_release build.
   ///
   /// We build CanvasKit in release mode to reduce code size.

tools/gn

@@ -627,6 +627,7 @@ def to_gn_wasm_args(args, gn_args):
   gn_args['skia_canvaskit_enable_webgpu'] = False
   is_profile_build = args.runtime_mode == 'profile' or args.runtime_mode == 'debug'
   gn_args['skia_canvaskit_profile_build'] = is_profile_build
+  gn_args['flutter_prebuilt_dart_sdk'] = True
 
 
 def parse_args(args):

wasm/BUILD.gn

@@ -8,5 +8,8 @@
 
 # This is the default target when building when the target CPU is WASM.
 group("wasm") {
-  deps = [ "//third_party/skia/modules/canvaskit" ]
+  deps = [
+    "//flutter/web_sdk",
+    "//third_party/skia/modules/canvaskit",
+  ]
 }

web_sdk/BUILD.gn

@@ -153,7 +153,7 @@ template("_dartdevc") {
         ":web_engine_library",
         ":web_ui_library",
         ":web_ui_library_sources",
-        "//flutter:dart_sdk",
+        "//flutter/dart_sdk",
       ]
       script = "//build/gn_run_binary.py"
 
@@ -184,7 +184,7 @@ template("_dartdevc") {
         ":web_engine_library",
         ":web_ui_library",
         ":web_ui_library_sources",
-        "//flutter:dart_sdk",
+        "//flutter/dart_sdk",
         "//third_party/dart/pkg:pkg_files_stamp",
         "//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
         "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
@@ -215,7 +215,7 @@ template("_kernel_worker") {
         ":web_engine_library",
         ":web_ui_library",
         ":web_ui_library_sources",
-        "//flutter:dart_sdk",
+        "//flutter/dart_sdk",
       ]
       script = "//build/gn_run_binary.py"
 
@@ -247,7 +247,7 @@ template("_kernel_worker") {
         ":web_engine_library",
         ":web_ui_library",
         ":web_ui_library_sources",
-        "//flutter:dart_sdk",
+        "//flutter/dart_sdk",
         "//third_party/dart/pkg:pkg_files_stamp",
         "//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
         "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",