commit 2e1c17e5c15766baa8771ad4f29ef188fec52699
author Sigmund Cherem <sigmund@google.com> Tue May 08 02:00:52 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Tue May 08 02:00:52 2018 +0000
tree 3d6d10c692ad2e7c77889f49a65c90c8849d782d
parent e10f0717d28d044ae17f25608864d203c0d242b6

Revert "dump-info: Use relative paths for library canonicalUri..."

This reverts commit 7fe8659613bfbf360d57d12327b7521cd869987a.

Reason for revert: we decided to take an alternative approach to solve the problem.

Original change's description:
> dump-info: Use relative paths for library canonicalUri...
> 
> ...if they are within the working directory
> 
> Makes output from dump-info more stable, especially with pkg:build
> 
> Change-Id: I3e6c444a0aa7df55c10e1bdff4b59ef035d2acc3
> Reviewed-on: https://dart-review.googlesource.com/53168
> Reviewed-by: Harry Terkelsen <het@google.com>
> Commit-Queue: Kevin Moore <kevmoo@google.com>

TBR=kevmoo@google.com,het@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I701847cf8879599c3d129a83809b8fe1c9d9d172
Reviewed-on: https://dart-review.googlesource.com/54141
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>

pkg/compiler/lib/src/dump_info.dart

diff --git a/pkg/compiler/lib/src/dump_info.dart b/pkg/compiler/lib/src/dump_info.dart
index 165643c..dee89c3 100644
--- a/pkg/compiler/lib/src/dump_info.dart
+++ b/pkg/compiler/lib/src/dump_info.dart
@@ -8,7 +8,6 @@
     show ChunkedConversionSink, JsonEncoder, StringConversionSink;
 
 import 'package:dart2js_info/info.dart';
-import 'package:path/path.dart' as p;
 
 import '../compiler_new.dart';
 import 'common/names.dart';
@@ -78,17 +77,7 @@
       libname = '<unnamed>';
     }
     int size = compiler.dumpInfoTask.sizeOf(lib);
-
-    var uri = lib.canonicalUri;
-    if (Uri.base.isScheme('file') && lib.canonicalUri.isScheme('file')) {
-      var basePath = p.fromUri(Uri.base);
-      var libPath = p.fromUri(lib.canonicalUri);
-      if (p.isWithin(basePath, libPath)) {
-        uri = p.toUri(p.relative(libPath, from: basePath));
-      }
-    }
-
-    LibraryInfo info = new LibraryInfo(libname, uri, null, size);
+    LibraryInfo info = new LibraryInfo(libname, lib.canonicalUri, null, size);
     _entityToInfo[lib] = info;
 
     environment.forEachLibraryMember(lib, (MemberEntity member) {

pkg/compiler/pubspec.yaml

diff --git a/pkg/compiler/pubspec.yaml b/pkg/compiler/pubspec.yaml
index 3530a9f..3cf04df 100644
--- a/pkg/compiler/pubspec.yaml
+++ b/pkg/compiler/pubspec.yaml
@@ -19,8 +19,6 @@
     path: ../../third_party/pkg/dart2js_info
   front_end:
     path: ../front_end
-  path:
-    path: ../../third_party/pkg/path
 dependency_overrides:
   front_end:
     path: ../front_end