Commit c1c15225 authored by Chris Bracken's avatar Chris Bracken Committed by GitHub

Make _createSnapshot private, depfilePath required (#11054)

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