Pass SdkLayout to the frontend server

frontend_server_common/lib/src/asset_server.dart

@@ -14,8 +14,7 @@ import 'package:file/file.dart';
 import 'package:logging/logging.dart';
 import 'package:mime/mime.dart' as mime;
 import 'package:shelf/shelf.dart' as shelf;
-
-import 'utilities.dart';
+import 'package:test_common/test_sdk_layout.dart';
 
 class TestAssetServer implements AssetReader {
   late final String basePath;
@@ -34,13 +33,15 @@ class TestAssetServer implements AssetReader {
   late String _mergedMetadata;
   final PackageUriMapper _packageUriMapper;
   final InternetAddress internetAddress;
+  final TestSdkLayout _sdkLayout;
 
   TestAssetServer(
     this.index,
     this._httpServer,
     this._packageUriMapper,
     this.internetAddress,
     this._fileSystem,
+    this._sdkLayout,
   ) {
     basePath = _parseBasePathFromIndexHtml(index);
   }
@@ -59,17 +60,19 @@ class TestAssetServer implements AssetReader {
   /// Unhandled exceptions will throw a exception with the error and stack
   /// trace.
   static Future<TestAssetServer> start(
+    String sdkDirectory,
     FileSystem fileSystem,
     String index,
     String hostname,
     int port,
     UrlEncoder? urlTunneler,
     PackageUriMapper packageUriMapper,
   ) async {
-    var address = (await InternetAddress.lookup(hostname)).first;
-    var httpServer = await HttpServer.bind(address, port);
-    var server = TestAssetServer(
-        index, httpServer, packageUriMapper, address, fileSystem);
+    final address = (await InternetAddress.lookup(hostname)).first;
+    final httpServer = await HttpServer.bind(address, port);
+    final sdkLayout = TestSdkLayout.createDefault(sdkDirectory);
+    final server = TestAssetServer(
+        index, httpServer, packageUriMapper, address, fileSystem, sdkLayout);
     return server;
   }
 
@@ -257,7 +260,7 @@ class TestAssetServer implements AssetReader {
     }
 
     // Otherwise it must be a Dart SDK source.
-    var dartSdkParent = _fileSystem.directory(dartSdkPath).parent;
+    var dartSdkParent = _fileSystem.directory(_sdkLayout.sdkDirectory).parent;
     var dartSdkFile = _fileSystem.file(
         _fileSystem.path.joinAll(<String>[dartSdkParent.path, ...segments]));
     return dartSdkFile;

frontend_server_common/lib/src/devfs.dart

@@ -43,7 +43,7 @@ class WebDevFS {
 
     fileSystem.currentDirectory = projectDirectory.toFilePath();
 
-    assetServer = await TestAssetServer.start(
+    assetServer = await TestAssetServer.start(sdkLayout.sdkDirectory,
         fileSystem, index, hostname, port, urlTunneler, packageUriMapper);
     return Uri.parse('http://$hostname:$port');
   }

frontend_server_common/lib/src/frontend_server_client.dart

@@ -396,7 +396,7 @@ class ResidentCompiler {
 
     _logger.info(args.join(' '));
     final workingDirectory = projectDirectory.toFilePath();
-    _server = await Process.start(Platform.resolvedExecutable, args,
+    _server = await Process.start(sdkLayout.dartPath, args,
         workingDirectory: workingDirectory);
 
     var server = _server!;

frontend_server_common/lib/src/resident_runner.dart

@@ -15,7 +15,6 @@ import 'package:test_common/test_sdk_layout.dart';
 
 import 'devfs.dart';
 import 'frontend_server_client.dart';
-import 'utilities.dart';
 
 class ResidentWebRunner {
   final _logger = Logger('ResidentWebRunner');
@@ -39,7 +38,7 @@ class ResidentWebRunner {
         : sdkLayout.weakSummaryPath);
 
     generator = ResidentCompiler(
-      dartSdkPath,
+      sdkLayout.sdkDirectory,
       projectDirectory: projectDirectory,
       packageConfigFile: packageConfigFile,
       useDebuggerModuleNames: packageUriMapper.useDebuggerModuleNames,

frontend_server_common/lib/src/utilities.dart

@@ -2,21 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:io';
-
 import 'package:file/file.dart' as fs;
 import 'package:file/local.dart';
-import 'package:path/path.dart' as p;
-
-/// The path to the root directory of the SDK.
-final String _sdkDir = (() {
-  // The Dart executable is in "/path/to/sdk/bin/dart", so two levels up is
-  // "/path/to/sdk".
-  var aboveExecutable = p.dirname(p.dirname(Platform.resolvedExecutable));
-  assert(FileSystemEntity.isFileSync(p.join(aboveExecutable, 'version')));
-  return aboveExecutable;
-})();
-
-final String dartSdkPath = _sdkDir;
 
 const fs.FileSystem localFileSystem = LocalFileSystem();