From c1c15225914cbc86a72caa802e4c0ff7ef07c00a Mon Sep 17 00:00:00 2001
From: Chris Bracken <chris@bracken.jp>
Date: Fri, 30 Jun 2017 12:48:12 -0700
Subject: [PATCH] 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.
---
 packages/flutter_tools/lib/src/flx.dart | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/flutter_tools/lib/src/flx.dart b/packages/flutter_tools/lib/src/flx.dart
index b4b91146876..d9ebce1c461 100644
--- a/packages/flutter_tools/lib/src/flx.dart
+++ b/packages/flutter_tools/lib/src/flx.dart
@@ -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,