Skip to content

Commit 9938ab1

Browse files
authored
[web] Remove --dart-sdk flag to dart2wasm compiler (flutter#149129)
Dart2wasm only needs a platform file, which contains the compiled `dart:*` libraries. There's no need to specify a seperate `--dart-sdk` option (anymore). (See also https://dart-review.googlesource.com/c/sdk/+/366821)
1 parent ea1976a commit 9938ab1

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

packages/flutter_tools/lib/src/build_system/targets/web.dart

-2
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ class Dart2WasmTarget extends Dart2WebTarget {
285285
final File outputWasmFile =
286286
environment.buildDir.childFile('main.dart.wasm');
287287
final File depFile = environment.buildDir.childFile('dart2wasm.d');
288-
final String dartSdkPath = artifacts.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript);
289288
final String platformBinariesPath = artifacts.getHostArtifact(HostArtifact.webPlatformKernelFolder).path;
290289
final String platformFilePath = environment.fileSystem.path.join(platformBinariesPath, 'dart2wasm_platform.dill');
291290
final List<String> dartDefines = compilerConfig.renderer.updateDartDefines(
@@ -298,7 +297,6 @@ class Dart2WasmTarget extends Dart2WebTarget {
298297
'compile',
299298
'wasm',
300299
'--packages=.dart_tool/package_config.json',
301-
'--extra-compiler-option=--dart-sdk=$dartSdkPath',
302300
'--extra-compiler-option=--platform=$platformFilePath',
303301
'--extra-compiler-option=--delete-tostring-package-uri=dart:ui',
304302
'--extra-compiler-option=--delete-tostring-package-uri=package:flutter',

packages/flutter_tools/lib/src/test/web_test_compiler.dart

-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ class WebTestCompiler {
222222
languageVersion: currentLanguageVersion(_fileSystem, Cache.flutterRoot!),
223223
);
224224

225-
final String dartSdkPath = _artifacts.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript);
226225
final String platformBinariesPath = _artifacts.getHostArtifact(HostArtifact.webPlatformKernelFolder).path;
227226
final String platformFilePath = _fileSystem.path.join(platformBinariesPath, 'dart2wasm_platform.dill');
228227
final List<String> dartDefines = webRenderer.updateDartDefines(buildInfo.dartDefines);
@@ -233,7 +232,6 @@ class WebTestCompiler {
233232
'compile',
234233
'wasm',
235234
'--packages=.dart_tool/package_config.json',
236-
'--extra-compiler-option=--dart-sdk=$dartSdkPath',
237235
'--extra-compiler-option=--platform=$platformFilePath',
238236
'--extra-compiler-option=--multi-root-scheme=org-dartlang-app',
239237
'--extra-compiler-option=--multi-root=${projectDirectory.childDirectory('test').path}',

packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ const List<String> _kDart2WasmLinuxArgs = <String> [
3434
'compile',
3535
'wasm',
3636
'--packages=.dart_tool/package_config.json',
37-
'--extra-compiler-option=--dart-sdk=Artifact.engineDartSdkPath.TargetPlatform.web_javascript',
3837
'--extra-compiler-option=--platform=HostArtifact.webPlatformKernelFolder/dart2wasm_platform.dill',
3938
'--extra-compiler-option=--delete-tostring-package-uri=dart:ui',
4039
'--extra-compiler-option=--delete-tostring-package-uri=package:flutter',

0 commit comments

Comments
 (0)