commit 0dc54542d0770b1b69e2b46df514df6e9d6508d0
author Alexander Aprelev <aam@google.com> Fri Oct 05 21:53:48 2018 +0000
committer Alexander Aprelev <aam@google.com> Fri Oct 05 21:53:48 2018 +0000
tree cf152ca00872044149c85aecca9d08682333b7ff
parent ea45756a7b799d28078a7addc8ef49a2a0c50f7a

[vm/frontend_server] Revert 218d30e26, but add uri check to ensure we don't write out corelibs.

Bug: https://github.com/flutter/flutter/issues/22721
Change-Id: I65843ab36bb63ad6d31c05a7ad1f001e8d611a10
Reviewed-on: https://dart-review.googlesource.com/c/78320
Commit-Queue: Alexander Aprelev <aam@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>

pkg/vm/lib/frontend_server.dart

diff --git a/pkg/vm/lib/frontend_server.dart b/pkg/vm/lib/frontend_server.dart
index 31f57e4..7cdc7d7 100644
--- a/pkg/vm/lib/frontend_server.dart
+++ b/pkg/vm/lib/frontend_server.dart
@@ -636,28 +636,14 @@
   return path.replaceAll(r'\', r'\\').replaceAll(r' ', r'\ ');
 }
 
-List<Uri> _getDependencies(Component component) {
-  var deps = <Uri>[];
-  for (Library lib in component.libraries) {
-    if (lib.importUri.scheme == 'dart') {
-      continue;
-    }
-    deps.add(lib.fileUri);
-    for (LibraryPart part in lib.parts) {
-      final Uri fileUri = lib.fileUri.resolve(part.partUri);
-      deps.add(fileUri);
-    }
-  }
-  return deps;
-}
-
 // https://ninja-build.org/manual.html#_depfile
 _writeDepfile(Component component, String output, String depfile) async {
   final IOSink file = new File(depfile).openWrite();
   file.write(_escapePath(output));
   file.write(':');
-  for (Uri dep in _getDependencies(component)) {
-    if (dep == null) continue;
+  for (Uri dep in component.uriToSource.keys) {
+    // Skip empty or corelib dependencies.
+    if (dep == null || dep.scheme == 'org-dartlang-sdk') continue;
     file.write(' ');
     file.write(_escapePath(dep.toFilePath()));
   }