commit af74a7253b5117cfd999d338db1eec4aea0f6fbf
author Alexander Aprelev <aam@google.com> Fri Mar 23 19:18:39 2018 -0700
committer GitHub <noreply@github.com> Fri Mar 23 19:18:39 2018 -0700
tree c9de16d503251c4c644c395918ade97ace15dffb
parent 2eebf6a0f1b998ca06998efd1a93145fb0d853af

Send relative uri when target physical file path is specified. (#15887)

packages/flutter_tools/lib/src/devfs.dart

diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart
index 4af38ac..79adfdc 100644
--- a/packages/flutter_tools/lib/src/devfs.dart
+++ b/packages/flutter_tools/lib/src/devfs.dart
@@ -409,6 +409,7 @@
     ResidentCompiler generator,
     String dillOutputPath,
     bool fullRestart: false,
+    String projectRootPath,
   }) async {
     // Mark all entries as possibly deleted.
     for (DevFSContent content in _entries.values) {
@@ -503,11 +504,16 @@
           await generator.recompile(mainPath, invalidatedFiles,
               outputPath:  dillOutputPath ?? fs.path.join(getBuildDirectory(), 'app.dill'),
               packagesFilePath : _packagesFilePath);
-      if (compiledBinary != null && compiledBinary.isNotEmpty)
+      if (compiledBinary != null && compiledBinary.isNotEmpty) {
+        final String entryUri = projectRootPath != null ?
+            fs.path.relative(mainPath, from: projectRootPath):
+            mainPath;
         dirtyEntries.putIfAbsent(
-          fs.path.toUri(target + '.dill'),
+          fs.path.toUri(entryUri + '.dill'),
           () => new DevFSFileContent(fs.file(compiledBinary))
         );
+      }
+
     }
     if (dirtyEntries.isNotEmpty) {
       printTrace('Updating files');