Skip first time full dill transfer (#21133)

* Don't sync first full kernel file. * Update the comment

Skip first time full dill transfer (#21133)
* Don't sync first full kernel file. * Update the comment
199422cd · Alexander Aprelev · GitHub · d107ff9d · 199422cd
Unverified Commit 199422cd authored Sep 13, 2018 by Alexander Aprelev Committed by GitHub Sep 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 10 deletions

devfs.dart packages/flutter_tools/lib/src/devfs.dart +14 -10

No files found.
--- a/packages/flutter_tools/lib/src/devfs.dart
+++ b/packages/flutter_tools/lib/src/devfs.dart
@@ -509,16 +509,20 @@ class DevFS {
      outputPath:  dillOutputPath ?? fs.path.join(getBuildDirectory(), 'app.dill'),
      packagesFilePath : _packagesFilePath,
    );
-    final String compiledBinary = compilerOutput?.outputFilename;
+    // Don't send full kernel file that would overwrite what VM already
-    if (compiledBinary != null && compiledBinary.isNotEmpty) {
+    // started loading from.
-      final Uri entryUri = fs.path.toUri(projectRootPath != null
+    if (!bundleFirstUpload) {
-        ? fs.path.relative(pathToReload, from: projectRootPath)
+      final String compiledBinary = compilerOutput?.outputFilename;
-        : pathToReload,
+      if (compiledBinary != null && compiledBinary.isNotEmpty) {
-      );
+        final Uri entryUri = fs.path.toUri(projectRootPath != null
-      if (!dirtyEntries.containsKey(entryUri)) {
+          ? fs.path.relative(pathToReload, from: projectRootPath)
-        final DevFSFileContent content = DevFSFileContent(fs.file(compiledBinary));
+          : pathToReload,
-        dirtyEntries[entryUri] = content;
+        );
-        numBytes += content.size;
+        if (!dirtyEntries.containsKey(entryUri)) {
+          final DevFSFileContent content = DevFSFileContent(fs.file(compiledBinary));
+          dirtyEntries[entryUri] = content;
+          numBytes += content.size;
+        }
      }
    }
    if (dirtyEntries.isNotEmpty) {