Implement support for specifying string interopolation style variable substitution in the import ...

bin/gen_snapshot.cc

Index: bin/gen_snapshot.cc
===================================================================
--- bin/gen_snapshot.cc	(revision 4054)
+++ bin/gen_snapshot.cc	(working copy)
@@ -116,7 +116,8 @@
 
 static Dart_Handle CreateSnapshotLibraryTagHandler(Dart_LibraryTag tag,
                                                    Dart_Handle library,
-                                                   Dart_Handle url) {
+                                                   Dart_Handle url,
+                                                   Dart_Handle import_map) {
   if (!Dart_IsLibrary(library)) {
     return Dart_Error("not a library");
   }
@@ -137,7 +138,12 @@
     }
     return DartUtils::CanonicalizeURL(url_mapping, library, url_string);
   }
-  return DartUtils::LoadSource(url_mapping, library, url, tag, url_string);
+  return DartUtils::LoadSource(url_mapping,
+                               library,
+                               url,
+                               tag,
+                               url_string,
+                               import_map);
 }
 
 
@@ -147,14 +153,19 @@
     return source;  // source contains the error string.
   }
   Dart_Handle url = Dart_NewString(script_name);
+  Dart_Handle import_map = Dart_NewList(0);
 
-  return Dart_LoadScript(url, source, CreateSnapshotLibraryTagHandler);
+  return Dart_LoadScript(url,
+                         source,
+                         CreateSnapshotLibraryTagHandler,
+                         import_map);
 }
 
 
 static Dart_Handle BuiltinLibraryTagHandler(Dart_LibraryTag tag,
                                             Dart_Handle library,
-                                            Dart_Handle url) {
+                                            Dart_Handle url,
+                                            Dart_Handle import_map) {
   if (!Dart_IsLibrary(library)) {
     return Dart_Error("not a library");
   }
@@ -187,7 +198,11 @@
   if (id == Builtin::kBuiltinLibrary) {
     // Load the dart:builtin library as the script.
     Dart_Handle url = Dart_NewString(DartUtils::kBuiltinLibURL);
-    lib = Dart_LoadScript(url, source, BuiltinLibraryTagHandler);
+    Dart_Handle import_map = Dart_NewList(0);
+    lib = Dart_LoadScript(url,
+                          source,
+                          BuiltinLibraryTagHandler,
+                          import_map);
   } else {
     ASSERT(id == Builtin::kIOLibrary);
     // Load the dart:io library to make it available in the snapshot