Revert "Store library paths relative to a given application root folder."

pkg/kernel/lib/analyzer/loader.dart

Index: pkg/kernel/lib/analyzer/loader.dart
diff --git a/pkg/kernel/lib/analyzer/loader.dart b/pkg/kernel/lib/analyzer/loader.dart
index 2cc2919b58b4e9ba8773d60305f33fca94f63dc9..1591bcf71f4e70afb4d1899d10b8e272ddb880c5 100644
--- a/pkg/kernel/lib/analyzer/loader.dart
+++ b/pkg/kernel/lib/analyzer/loader.dart
@@ -16,7 +16,6 @@ import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/parser.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source_io.dart';
-import 'package:kernel/application_root.dart';
 import 'package:package_config/discovery.dart';
 import 'package:package_config/packages.dart';
 
@@ -36,7 +35,6 @@ class DartOptions {
   bool strongModeSdk;
   String sdk;
   String packagePath;
-  ApplicationRoot applicationRoot;
   Map<Uri, Uri> customUriMappings;
   Map<String, String> declaredVariables;
 
@@ -45,7 +43,6 @@ class DartOptions {
       bool strongModeSdk,
       this.sdk,
       this.packagePath,
-      this.applicationRoot,
       Map<Uri, Uri> customUriMappings,
       Map<String, String> declaredVariables})
       : this.customUriMappings = customUriMappings ?? <Uri, Uri>{},
@@ -71,7 +68,6 @@ abstract class ReferenceLevelLoader {
 
 class DartLoader implements ReferenceLevelLoader {
   final Repository repository;
-  final ApplicationRoot applicationRoot;
   final Bimap<ClassElement, ast.Class> _classes =
       new Bimap<ClassElement, ast.Class>();
   final Bimap<Element, ast.Member> _members = new Bimap<Element, ast.Member>();
@@ -94,16 +90,19 @@ class DartLoader implements ReferenceLevelLoader {
 
   DartLoader(this.repository, DartOptions options, Packages packages,
       {DartSdk dartSdk})
-      : this.context = createContext(options, packages, dartSdk: dartSdk),
-        this.applicationRoot = options.applicationRoot;
+      : this.context = createContext(options, packages, dartSdk: dartSdk);
+
+  LibraryElement getLibraryElement(ast.Library node) {
+    return context
+        .getLibraryElement(context.sourceFactory.forUri2(node.importUri));
+  }
 
   String getLibraryName(LibraryElement element) {
     return element.name.isEmpty ? null : element.name;
   }
 
   ast.Library getLibraryReference(LibraryElement element) {
-    var uri = applicationRoot.relativeUri(element.source.uri);
-    return repository.getLibraryReference(uri)
+    return repository.getLibraryReference(element.source.uri)
       ..name ??= getLibraryName(element)
       ..fileUri = "file://${element.source.fullName}";
   }
@@ -580,8 +579,7 @@ class DartLoader implements ReferenceLevelLoader {
   void ensureLibraryIsLoaded(ast.Library node) {
     if (!node.isExternal) return;
     node.isExternal = false;
-    var source = context.sourceFactory
-        .forUri2(applicationRoot.absoluteUri(node.importUri));
+    var source = context.sourceFactory.forUri2(node.importUri);
     assert(source != null);
     var element = context.computeLibraryElement(source);
     context.resolveCompilationUnit(source, element);
@@ -625,9 +623,8 @@ class DartLoader implements ReferenceLevelLoader {
   List<String> getLoadedFileNames() {
     var list = <String>[];
     for (var library in repository.libraries) {
-      LibraryElement element = context.computeLibraryElement(context
-          .sourceFactory
-          .forUri2(applicationRoot.absoluteUri(library.importUri)));
+      LibraryElement element = context.computeLibraryElement(
+          context.sourceFactory.forUri2(library.importUri));
       for (var unit in element.units) {
         list.add(unit.source.fullName);
       }
@@ -643,8 +640,7 @@ class DartLoader implements ReferenceLevelLoader {
   }
 
   ast.Program loadProgram(String mainLibrary, {Target target}) {
-    ast.Library library =
-        repository.getLibraryReference(applicationRoot.resolve(mainLibrary));
+    ast.Library library = repository.getLibrary(mainLibrary);
     ensureLibraryIsLoaded(library);
     loadEverything(target: target);
     var program = new ast.Program(repository.libraries);
@@ -666,8 +662,7 @@ class DartLoader implements ReferenceLevelLoader {
   }
 
   ast.Library loadLibrary(String mainLibrary) {
-    ast.Library library =
-        repository.getLibraryReference(applicationRoot.resolve(mainLibrary));
+    ast.Library library = repository.getLibrary(mainLibrary);
     ensureLibraryIsLoaded(library);
     return library;
   }