firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_tools] remove workaround for caching sound dill (#70014)

Browse Source
This commit is contained in:
Jonah Williams 2020-11-09 11:53:56 -08:00 committed by GitHub
parent 9f36a02734
commit 4c511fbde2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/flutter_tools/lib/src/bundle.dart
View File

@ -29,12 +29,10 @@ String get defaultDepfilePath => globals.fs.path.join(getBuildDirectory(), 'snap
String getDefaultApplicationKernelPath({
@required bool trackWidgetCreation,
@required NullSafetyMode nullSafetyMode,
}) {
return getKernelPathForTransformerOptions(
globals.fs.path.join(getBuildDirectory(), 'app.dill'),
trackWidgetCreation: trackWidgetCreation,
nullSafetyMode: nullSafetyMode,
);
}
@ -42,7 +40,6 @@ String getDefaultCachedKernelPath({
@required bool trackWidgetCreation,
@required List<String> dartDefines,
@required List<String> extraFrontEndOptions,
@required NullSafetyMode nullSafetyMode,
}) {
final StringBuffer buffer = StringBuffer();
buffer.writeAll(dartDefines);
@ -56,21 +53,13 @@ String getDefaultCachedKernelPath({
return getKernelPathForTransformerOptions(
globals.fs.path.join(getBuildDirectory(), '${buildPrefix}cache.dill'),
trackWidgetCreation: trackWidgetCreation,
nullSafetyMode: nullSafetyMode,
);
}
String getKernelPathForTransformerOptions(
String path, {
@required bool trackWidgetCreation,
@required NullSafetyMode nullSafetyMode,
}) {
// Temporary work around until --initialize-from-dill accounts for sound mode.
// The tool does not know the compilation mode if [NullSafetyMode.autodetect] is
// selected.
if (nullSafetyMode == NullSafetyMode.sound) {
path += '.sound';
}
if (trackWidgetCreation) {
path += '.track.dill';
}

3
packages/flutter_tools/lib/src/resident_runner.dart
View File

@ -123,7 +123,6 @@ class FlutterDevice {
trackWidgetCreation: buildInfo.trackWidgetCreation,
dartDefines: buildInfo.dartDefines,
extraFrontEndOptions: extraFrontEndOptions,
nullSafetyMode: buildInfo.nullSafetyMode,
),
targetModel: TargetModel.dartdevc,
extraFrontEndOptions: extraFrontEndOptions,
@ -165,7 +164,6 @@ class FlutterDevice {
trackWidgetCreation: buildInfo.trackWidgetCreation,
dartDefines: buildInfo.dartDefines,
extraFrontEndOptions: extraFrontEndOptions,
nullSafetyMode: buildInfo.nullSafetyMode,
),
packagesPath: buildInfo.packagesPath,
artifacts: globals.artifacts,
@ -1181,7 +1179,6 @@ abstract class ResidentRunner {
trackWidgetCreation: trackWidgetCreation,
dartDefines: debuggingOptions.buildInfo.dartDefines,
extraFrontEndOptions: debuggingOptions.buildInfo.extraFrontEndOptions,
nullSafetyMode: debuggingOptions.buildInfo.nullSafetyMode,
);
globals.fs
.file(copyPath)

1
packages/flutter_tools/lib/src/run_hot.dart
View File

@ -330,7 +330,6 @@ class HotRunner extends ResidentRunner {
outputPath: dillOutputPath ??
getDefaultApplicationKernelPath(
trackWidgetCreation: debuggingOptions.buildInfo.trackWidgetCreation,
nullSafetyMode: debuggingOptions.buildInfo.nullSafetyMode,
),
packageConfig: packageConfig,
).then((CompilerOutput output) => output?.errorCount == 0)

1
packages/flutter_tools/lib/src/test/test_compiler.dart
View File

@ -45,7 +45,6 @@ class TestCompiler {
'test_cache',
getDefaultCachedKernelPath(
trackWidgetCreation: buildInfo.trackWidgetCreation,
nullSafetyMode: buildInfo.nullSafetyMode,
dartDefines: buildInfo.dartDefines,
extraFrontEndOptions: buildInfo.extraFrontEndOptions,
)) {

1
packages/flutter_tools/lib/src/tester/flutter_tester.dart
View File

@ -153,7 +153,6 @@ class FlutterTesterDevice extends Device {
final String applicationKernelFilePath = getKernelPathForTransformerOptions(
_fileSystem.path.join(_buildDirectory, 'flutter-tester-app.dill'),
trackWidgetCreation: buildInfo.trackWidgetCreation,
nullSafetyMode: buildInfo.nullSafetyMode,
);
// Build assets and perform initial compilation.
await BundleBuilder().build(

34
packages/flutter_tools/test/general.shard/resident_runner_test.dart
View File

@ -2397,40 +2397,6 @@ void main() {
expect(await globals.fs.file(globals.fs.path.join('build', 'cache.dill.track.dill')).readAsString(), 'ABC');
}));
testUsingContext('HotRunner copies compiled app.dill to cache during startup with --sound-null-safety', () => testbed.run(() async {
fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
listViews,
listViews,
setAssetBundlePath,
]);
setWsAddress(testUri, fakeVmServiceHost.vmService);
globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
residentRunner = HotRunner(
<FlutterDevice>[
mockFlutterDevice,
],
stayResident: false,
debuggingOptions: DebuggingOptions.enabled(const BuildInfo(
BuildMode.debug,
'',
treeShakeIcons: false,
trackWidgetCreation: true,
nullSafetyMode: NullSafetyMode.sound,
)),
);
residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
when(mockFlutterDevice.runHot(
hotRunner: anyNamed('hotRunner'),
route: anyNamed('route'),
)).thenAnswer((Invocation invocation) async {
return 0;
});
await residentRunner.run();
expect(await globals.fs.file(globals.fs.path.join('build', 'cache.dill.sound.track.dill')).readAsString(), 'ABC');
}));
testUsingContext('HotRunner unforwards device ports', () => testbed.run(() async {
fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
listViews,