| Index: lib/compiler/implementation/scanner/scanner_task.dart
|
| diff --git a/lib/compiler/implementation/scanner/scanner_task.dart b/lib/compiler/implementation/scanner/scanner_task.dart
|
| index 5bf5c9e22591072a64f7ae218a044fcb715fcd43..25793e774c993f9cb0d23a0c13d0d24d8eb33a77 100644
|
| --- a/lib/compiler/implementation/scanner/scanner_task.dart
|
| +++ b/lib/compiler/implementation/scanner/scanner_task.dart
|
| @@ -78,20 +78,12 @@ class ScannerTask extends CompilerTask {
|
| // Now that we have processed all the source tags, it is safe to
|
| // start loading other libraries.
|
|
|
| - // TODO(ahe): During Compiler.scanBuiltinLibraries,
|
| - // compiler.coreLibrary is null. Clean this up when there is a
|
| - // better way to access "dart:core".
|
| - bool implicitlyImportCoreLibrary = compiler.coreLibrary !== null;
|
| + if (library.uri.scheme != 'dart' || library.uri.path != 'core') {
|
| + compiler.importCoreLibrary(library);
|
| + }
|
|
|
| for (ScriptTag tag in imports.toLink()) {
|
| - Uri resolvedUri =
|
| - importLibraryFromTag(tag, library.entryCompilationUnit);
|
| - if (resolvedUri.toString() == "dart:core") {
|
| - implicitlyImportCoreLibrary = false;
|
| - }
|
| - }
|
| - if (implicitlyImportCoreLibrary) {
|
| - importLibrary(library, compiler.coreLibrary, null);
|
| + importLibraryFromTag(tag, library.entryCompilationUnit);
|
| }
|
| }
|
|
|
|
|