File tree Expand file tree Collapse file tree 2 files changed +4
-21
lines changed
lib/src/build_system/targets
test/general.shard/build_system/targets Expand file tree Collapse file tree 2 files changed +4
-21
lines changed Original file line number Diff line number Diff line change @@ -238,22 +238,16 @@ class Dart2WasmTarget extends Dart2WebTarget {
238
238
);
239
239
final File depFile = environment.buildDir.childFile ('dart2wasm.d' );
240
240
final String dartSdkPath = artifacts.getArtifactPath (Artifact .engineDartSdkPath, platform: TargetPlatform .web_javascript);
241
- final String dartSdkRoot = environment.fileSystem.directory (dartSdkPath).parent.path;
241
+ final String platformBinariesPath = getWebPlatformBinariesDirectory (artifacts, webRenderer).path;
242
+ final String platformFilePath = environment.fileSystem.path.join (platformBinariesPath, 'dart2wasm_platform.dill' );
242
243
243
244
final List <String > compilationArgs = < String > [
244
245
artifacts.getArtifactPath (Artifact .engineDartAotRuntime, platform: TargetPlatform .web_javascript),
245
246
'--disable-dart-dev' ,
246
247
artifacts.getArtifactPath (Artifact .dart2wasmSnapshot, platform: TargetPlatform .web_javascript),
247
248
'--packages=.dart_tool/package_config.json' ,
248
249
'--dart-sdk=$dartSdkPath ' ,
249
- '--multi-root-scheme' ,
250
- 'org-dartlang-sdk' ,
251
- '--multi-root' ,
252
- artifacts.getHostArtifact (HostArtifact .flutterWebSdk).path,
253
- '--multi-root' ,
254
- dartSdkRoot,
255
- '--libraries-spec' ,
256
- artifacts.getHostArtifact (HostArtifact .flutterWebLibrariesJson).path,
250
+ '--platform=$platformFilePath ' ,
257
251
if (buildMode == BuildMode .profile)
258
252
'-Ddart.vm.profile=true'
259
253
else
Original file line number Diff line number Diff line change @@ -36,14 +36,7 @@ const List<String> _kDart2WasmLinuxArgs = <String> [
36
36
'Artifact.dart2wasmSnapshot.TargetPlatform.web_javascript' ,
37
37
'--packages=.dart_tool/package_config.json' ,
38
38
'--dart-sdk=Artifact.engineDartSdkPath.TargetPlatform.web_javascript' ,
39
- '--multi-root-scheme' ,
40
- 'org-dartlang-sdk' ,
41
- '--multi-root' ,
42
- 'HostArtifact.flutterWebSdk' ,
43
- '--multi-root' ,
44
- _kDartSdkRoot,
45
- '--libraries-spec' ,
46
- 'HostArtifact.flutterWebLibrariesJson' ,
39
+ '--platform=HostArtifact.webPlatformKernelFolder/dart2wasm_platform.dill' ,
47
40
];
48
41
49
42
const List <String > _kWasmOptLinuxArgrs = < String > [
@@ -58,10 +51,6 @@ const List<String> _kWasmOptLinuxArgrs = <String> [
58
51
'--type-merging' ,
59
52
];
60
53
61
- /// The result of calling `.parent` on a Memory directory pointing to
62
- /// `'Artifact.engineDartSdkPath.TargetPlatform.web_javascript'` .
63
- const String _kDartSdkRoot = '.' ;
64
-
65
54
void main () {
66
55
late Testbed testbed;
67
56
late Environment environment;
You can’t perform that action at this time.
0 commit comments