Resubmit change 7506.

bin/main.cc

Index: bin/main.cc
===================================================================
--- bin/main.cc	(revision 7508)
+++ bin/main.cc	(working copy)
@@ -429,7 +429,7 @@
     }
     free(name);
   }
-  return Dart_LoadScript(script_url, source, LibraryTagHandler, import_map);
+  return Dart_LoadScript(script_url, source, import_map);
 }
 
 
@@ -450,6 +450,13 @@
     Builtin::SetNativeResolver(Builtin::kIOLibrary);
   }
 
+  // Set up the library tag handler for this isolate.
+  Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
+  if (Dart_IsError(result)) {
+    *error = strdup(Dart_GetError(result));
+    return false;
+  }
+
   // Prepare builtin and its dependent libraries for use to resolve URIs.
   Dart_Handle uri_lib = Builtin::LoadLibrary(Builtin::kUriLibrary);
   if (Dart_IsError(uri_lib)) {
@@ -461,11 +468,6 @@
     *error = strdup(Dart_GetError(builtin_lib));
     return false;
   }
-  Dart_Handle library = Dart_LibraryImportLibrary(builtin_lib, uri_lib);
-  if (Dart_IsError(library)) {
-    *error = strdup(Dart_GetError(library));
-    return false;
-  }
 
   if (package_root != NULL) {
     Dart_Handle dart_args[1];
@@ -486,7 +488,7 @@
   }
 
   // Load the specified application script into the newly created isolate.
-  library = LoadScript(builtin_lib, import_map_options);
+  Dart_Handle library = LoadScript(builtin_lib, import_map_options);
   if (Dart_IsError(library)) {
     *error = strdup(Dart_GetError(library));
     Dart_ExitScope();