DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make _createSnapshot private, depfilePath required (#11054)

Browse Source 
* Only one call to createSnapshot exists, and it's in the same library.

* Eliminate conditional logic around the presence of depfilePath, the
  only existing call always passes a non-null depfilePath.
This commit is contained in:
Chris Bracken 2017-06-30 12:48:12 -07:00 committed by GitHub
parent c1e3b75cc2
commit c1c1522591
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/flutter_tools/lib/src/flx.dart
View File

@ -29,14 +29,15 @@ const String _kKernelKey = 'kernel_blob.bin';
const String _kSnapshotKey = 'snapshot_blob.bin';
const String _kDylibKey = 'libapp.so';
Future<int> createSnapshot({
Future<int> _createSnapshot({
@required String mainPath,
@required String snapshotPath,
String depfilePath,
@required String depfilePath,
@required String packages
}) {
assert(mainPath != null);
assert(snapshotPath != null);
assert(depfilePath != null);
assert(packages != null);
final String snapshotterPath = artifacts.getArtifactPath(Artifact.genSnapshot, null, BuildMode.debug);
final String vmSnapshotData = artifacts.getArtifactPath(Artifact.vmSnapshotData);
@ -48,13 +49,11 @@ Future<int> createSnapshot({
'--vm_snapshot_data=$vmSnapshotData',
'--isolate_snapshot_data=$isolateSnapshotData',
'--packages=$packages',
'--script_snapshot=$snapshotPath'
'--script_snapshot=$snapshotPath',
'--dependencies=$depfilePath',
mainPath,
];
if (depfilePath != null) {
args.add('--dependencies=$depfilePath');
fs.file(depfilePath).parent.childFile('gen_snapshot.d').writeAsString('$depfilePath: $snapshotterPath\n');
}
args.add(mainPath);
fs.file(depfilePath).parent.childFile('gen_snapshot.d').writeAsString('$depfilePath: $snapshotterPath\n');
return runCommandAndStreamOutput(args);
}
@ -83,7 +82,7 @@ Future<Null> build({
// In a precompiled snapshot, the instruction buffer contains script
// content equivalents
final int result = await createSnapshot(
final int result = await _createSnapshot(
mainPath: mainPath,
snapshotPath: snapshotPath,
depfilePath: depfilePath,