Commit b028ee14 authored by Gary Qian's avatar Gary Qian Committed by Dan Field

Revert "Experimental flags for hot reloads, fixed" (#27059)

* Revert "Make UriMapper and StdoutHandler public and add test cases (#26932)"

This reverts commit 6cf554b0.

* Revert "Update packages (#27046)"

This reverts commit 496c5738.

* Revert "roll engine for TODAY bug (#27049)"

This reverts commit 5ae6346f.

* Revert "Warn when building on master channel (#25007)"

This reverts commit dd65a546.

* Revert "Add experimentalBuildEnabled flag and initial shim for build_runner (#26989)"

This reverts commit 1237ee8f.

* Revert "Experimental flags for hot reloads, fixed (#27043)"

This reverts commit 2c05d08f.
parent 6cf554b0
...@@ -333,11 +333,6 @@ class RunCommand extends RunCommandBase { ...@@ -333,11 +333,6 @@ class RunCommand extends RunCommandBase {
throwToolExit('Error: --train is only allowed when running as --dynamic --profile ' throwToolExit('Error: --train is only allowed when running as --dynamic --profile '
'(recommended) or --debug (may include unwanted debug symbols).'); '(recommended) or --debug (may include unwanted debug symbols).');
List<String> expFlags;
if (argParser.options.containsKey(FlutterOptions.kEnableExperiment) &&
argResults[FlutterOptions.kEnableExperiment] != null) {
expFlags = argResults[FlutterOptions.kEnableExperiment];
}
final List<FlutterDevice> flutterDevices = devices.map<FlutterDevice>((Device device) { final List<FlutterDevice> flutterDevices = devices.map<FlutterDevice>((Device device) {
return FlutterDevice( return FlutterDevice(
device, device,
...@@ -346,7 +341,6 @@ class RunCommand extends RunCommandBase { ...@@ -346,7 +341,6 @@ class RunCommand extends RunCommandBase {
fileSystemRoots: argResults['filesystem-root'], fileSystemRoots: argResults['filesystem-root'],
fileSystemScheme: argResults['filesystem-scheme'], fileSystemScheme: argResults['filesystem-scheme'],
viewFilter: argResults['isolate-filter'], viewFilter: argResults['isolate-filter'],
experimentalFlags: expFlags,
); );
}).toList(); }).toList();
......
...@@ -331,8 +331,7 @@ class ResidentCompiler { ...@@ -331,8 +331,7 @@ class ResidentCompiler {
CompilerMessageConsumer compilerMessageConsumer = printError, CompilerMessageConsumer compilerMessageConsumer = printError,
String initializeFromDill, String initializeFromDill,
TargetModel targetModel = TargetModel.flutter, TargetModel targetModel = TargetModel.flutter,
bool unsafePackageSerialization, bool unsafePackageSerialization
List<String> experimentalFlags,
}) : assert(_sdkRoot != null), }) : assert(_sdkRoot != null),
_trackWidgetCreation = trackWidgetCreation, _trackWidgetCreation = trackWidgetCreation,
_packagesPath = packagesPath, _packagesPath = packagesPath,
...@@ -342,8 +341,7 @@ class ResidentCompiler { ...@@ -342,8 +341,7 @@ class ResidentCompiler {
_stdoutHandler = StdoutHandler(consumer: compilerMessageConsumer), _stdoutHandler = StdoutHandler(consumer: compilerMessageConsumer),
_controller = StreamController<_CompilationRequest>(), _controller = StreamController<_CompilationRequest>(),
_initializeFromDill = initializeFromDill, _initializeFromDill = initializeFromDill,
_unsafePackageSerialization = unsafePackageSerialization, _unsafePackageSerialization = unsafePackageSerialization {
_experimentalFlags = experimentalFlags {
// This is a URI, not a file path, so the forward slash is correct even on Windows. // This is a URI, not a file path, so the forward slash is correct even on Windows.
if (!_sdkRoot.endsWith('/')) if (!_sdkRoot.endsWith('/'))
_sdkRoot = '$_sdkRoot/'; _sdkRoot = '$_sdkRoot/';
...@@ -359,7 +357,6 @@ class ResidentCompiler { ...@@ -359,7 +357,6 @@ class ResidentCompiler {
final StdoutHandler _stdoutHandler; final StdoutHandler _stdoutHandler;
String _initializeFromDill; String _initializeFromDill;
bool _unsafePackageSerialization; bool _unsafePackageSerialization;
final List<String> _experimentalFlags;
final StreamController<_CompilationRequest> _controller; final StreamController<_CompilationRequest> _controller;
...@@ -472,10 +469,6 @@ class ResidentCompiler { ...@@ -472,10 +469,6 @@ class ResidentCompiler {
if (_unsafePackageSerialization == true) { if (_unsafePackageSerialization == true) {
command.add('--unsafe-package-serialization'); command.add('--unsafe-package-serialization');
} }
if (_experimentalFlags != null) {
final String expFlags = _experimentalFlags.join(',');
command.add('--enable-experiment=$expFlags');
}
printTrace(command.join(' ')); printTrace(command.join(' '));
_server = await processManager.start(command); _server = await processManager.start(command);
_server.stdout _server.stdout
......
...@@ -35,7 +35,6 @@ class FlutterDevice { ...@@ -35,7 +35,6 @@ class FlutterDevice {
this.fileSystemScheme, this.fileSystemScheme,
this.viewFilter, this.viewFilter,
TargetModel targetModel = TargetModel.flutter, TargetModel targetModel = TargetModel.flutter,
List<String> experimentalFlags,
ResidentCompiler generator, ResidentCompiler generator,
}) : assert(trackWidgetCreation != null), }) : assert(trackWidgetCreation != null),
generator = generator ?? ResidentCompiler( generator = generator ?? ResidentCompiler(
...@@ -44,7 +43,6 @@ class FlutterDevice { ...@@ -44,7 +43,6 @@ class FlutterDevice {
fileSystemRoots: fileSystemRoots, fileSystemRoots: fileSystemRoots,
fileSystemScheme: fileSystemScheme, fileSystemScheme: fileSystemScheme,
targetModel: targetModel, targetModel: targetModel,
experimentalFlags: experimentalFlags,
); );
final Device device; final Device device;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment