Remove unnecessary variables. (#86444)
diff --git a/packages/flutter_tools/lib/src/commands/attach.dart b/packages/flutter_tools/lib/src/commands/attach.dart
index ef72ce3..7debc8e 100644
--- a/packages/flutter_tools/lib/src/commands/attach.dart
+++ b/packages/flutter_tools/lib/src/commands/attach.dart
@@ -411,8 +411,6 @@
final FlutterDevice flutterDevice = await FlutterDevice.create(
device,
- fileSystemRoots: stringsArg(FlutterOptions.kFileSystemRoot),
- fileSystemScheme: stringArg(FlutterOptions.kFileSystemScheme),
target: targetFile,
targetModel: TargetModel(stringArg('target-model')),
buildInfo: buildInfo,
diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart
index d650394..452f227 100644
--- a/packages/flutter_tools/lib/src/commands/run.dart
+++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -616,8 +616,6 @@
for (final Device device in devices)
await FlutterDevice.create(
device,
- fileSystemRoots: fileSystemRoots,
- fileSystemScheme: fileSystemScheme,
experimentalFlags: expFlags,
target: targetFile,
buildInfo: buildInfo,
diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart
index e8a69fb..b41bc4f 100644
--- a/packages/flutter_tools/lib/src/compile.dart
+++ b/packages/flutter_tools/lib/src/compile.dart
@@ -542,7 +542,7 @@
this.testCompilation = false,
this.trackWidgetCreation = true,
this.packagesPath,
- this.fileSystemRoots = const <String>[],
+ List<String> fileSystemRoots = const <String>[],
this.fileSystemScheme,
this.initializeFromDill,
this.targetModel = TargetModel.flutter,
@@ -560,7 +560,9 @@
_platform = platform,
dartDefines = dartDefines ?? const <String>[],
// This is a URI, not a file path, so the forward slash is correct even on Windows.
- sdkRoot = sdkRoot.endsWith('/') ? sdkRoot : '$sdkRoot/';
+ sdkRoot = sdkRoot.endsWith('/') ? sdkRoot : '$sdkRoot/',
+ // Make a copy, we might need to modify it later.
+ fileSystemRoots = List<String>.from(fileSystemRoots);
final Logger _logger;
final ProcessManager _processManager;
diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart
index e1b0fd1..29f7d4d 100644
--- a/packages/flutter_tools/lib/src/resident_runner.dart
+++ b/packages/flutter_tools/lib/src/resident_runner.dart
@@ -47,8 +47,6 @@
FlutterDevice(
this.device, {
@required this.buildInfo,
- this.fileSystemRoots,
- this.fileSystemScheme,
TargetModel targetModel = TargetModel.flutter,
this.targetPlatform,
ResidentCompiler generator,
@@ -62,8 +60,8 @@
),
buildMode: buildInfo.mode,
trackWidgetCreation: buildInfo.trackWidgetCreation,
- fileSystemRoots: fileSystemRoots ?? <String>[],
- fileSystemScheme: fileSystemScheme,
+ fileSystemRoots: buildInfo.fileSystemRoots ?? <String>[],
+ fileSystemScheme: buildInfo.fileSystemScheme,
targetModel: targetModel,
dartDefines: buildInfo.dartDefines,
packagesPath: buildInfo.packagesPath,
@@ -81,8 +79,6 @@
@required String target,
@required BuildInfo buildInfo,
@required Platform platform,
- List<String> fileSystemRoots,
- String fileSystemScheme,
TargetModel targetModel = TargetModel.flutter,
List<String> experimentalFlags,
ResidentCompiler generator,
@@ -121,7 +117,7 @@
globals.artifacts.getHostArtifact(HostArtifact.flutterWebSdk).path,
buildMode: buildInfo.mode,
trackWidgetCreation: buildInfo.trackWidgetCreation,
- fileSystemRoots: fileSystemRoots ?? <String>[],
+ fileSystemRoots: buildInfo.fileSystemRoots ?? <String>[],
// Override the filesystem scheme so that the frontend_server can find
// the generated entrypoint code.
fileSystemScheme: 'org-dartlang-app',
@@ -162,8 +158,8 @@
),
buildMode: buildInfo.mode,
trackWidgetCreation: buildInfo.trackWidgetCreation,
- fileSystemRoots: fileSystemRoots,
- fileSystemScheme: fileSystemScheme,
+ fileSystemRoots: buildInfo.fileSystemRoots,
+ fileSystemScheme: buildInfo.fileSystemScheme,
targetModel: targetModel,
dartDefines: buildInfo.dartDefines,
extraFrontEndOptions: extraFrontEndOptions,
@@ -183,8 +179,6 @@
return FlutterDevice(
device,
- fileSystemRoots: fileSystemRoots,
- fileSystemScheme:fileSystemScheme,
targetModel: targetModel,
targetPlatform: targetPlatform,
generator: generator,
@@ -204,8 +198,6 @@
FlutterVmService vmService;
DevFS devFS;
ApplicationPackage package;
- List<String> fileSystemRoots;
- String fileSystemScheme;
StreamSubscription<String> _loggingSubscription;
bool _isListeningForObservatoryUri;
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart
index 6038585..6f988d1 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart
@@ -197,8 +197,8 @@
// output dill, filesystem scheme, and filesystem root.
final FlutterDevice flutterDevice = hotRunnerFactory.devices.first;
- expect(flutterDevice.fileSystemScheme, filesystemScheme);
- expect(flutterDevice.fileSystemRoots, const <String>[filesystemRoot]);
+ expect(flutterDevice.buildInfo.fileSystemScheme, filesystemScheme);
+ expect(flutterDevice.buildInfo.fileSystemRoots, const <String>[filesystemRoot]);
}, overrides: <Type, Generator>{
FileSystem: () => testFileSystem,
ProcessManager: () => FakeProcessManager.any(),
