Support symbolic links and package imports in gen_snapshot.

runtime/bin/dartutils.cc

Index: runtime/bin/dartutils.cc
diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc
index 309b5dfdf8f90ffe6e5307cb2f6d9110136de766..339b036869130f4aa9e1a7f286b43844905ddbc6 100644
--- a/runtime/bin/dartutils.cc
+++ b/runtime/bin/dartutils.cc
@@ -37,8 +37,8 @@ static bool IsWindowsHost() {
 }
 
 
-static const char* MapLibraryUrl(CommandLineOptions* url_mapping,
-                                 const char* url_string) {
+const char* DartUtils::MapLibraryUrl(CommandLineOptions* url_mapping,
+                                     const char* url_string) {
   ASSERT(url_mapping != NULL);
   // We need to check if the passed in url is found in the url_mapping array,
   // in that case use the mapped entry.
@@ -233,32 +233,42 @@ Dart_Handle DartUtils::ReadStringFromFile(const char* filename) {
 }
 
 
-static Dart_Handle ResolveScriptUri(Dart_Handle script_uri,
-                                    Dart_Handle builtin_lib) {
+Dart_Handle DartUtils::ResolveScriptUri(Dart_Handle script_uri,
+                                        Dart_Handle builtin_lib) {
   const int kNumArgs = 3;
   Dart_Handle dart_args[kNumArgs];
-  dart_args[0] = DartUtils::NewString(DartUtils::original_working_directory);
+  dart_args[0] = NewString(original_working_directory);
   dart_args[1] = script_uri;
   dart_args[2] = (IsWindowsHost() ? Dart_True() : Dart_False());
   return Dart_Invoke(builtin_lib,
-                     DartUtils::NewString("_resolveScriptUri"),
+                     NewString("_resolveScriptUri"),
                      kNumArgs,
                      dart_args);
 }
 
 
-static Dart_Handle FilePathFromUri(Dart_Handle script_uri,
-                                   Dart_Handle builtin_lib) {
+Dart_Handle DartUtils::FilePathFromUri(Dart_Handle script_uri,
+                                       Dart_Handle builtin_lib) {
   const int kNumArgs = 2;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = script_uri;
   dart_args[1] = (IsWindowsHost() ? Dart_True() : Dart_False());
-  Dart_Handle script_path = Dart_Invoke(
-      builtin_lib,
-      DartUtils::NewString("_filePathFromUri"),
-      kNumArgs,
-      dart_args);
-  return script_path;
+  return Dart_Invoke(builtin_lib,
+                     NewString("_filePathFromUri"),
+                     kNumArgs,
+                     dart_args);
+}
+
+
+Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url,
+                                  Dart_Handle url,
+                                  Dart_Handle builtin_lib) {
+  const int kNumArgs = 2;
+  Dart_Handle dart_args[kNumArgs];
+  dart_args[0] = library_url;
+  dart_args[1] = url;
+  return Dart_Invoke(
+      builtin_lib, NewString("_resolveUri"), kNumArgs, dart_args);
 }
 
 
@@ -291,12 +301,7 @@ Dart_Handle DartUtils::LibraryTagHandler(Dart_LibraryTag tag,
     if (Dart_IsError(library_url)) {
       return library_url;
     }
-    const int kNumArgs = 2;
-    Dart_Handle dart_args[kNumArgs];
-    dart_args[0] = library_url;
-    dart_args[1] = url;
-    return Dart_Invoke(
-        builtin_lib, NewString("_resolveUri"), kNumArgs, dart_args);
+    return ResolveUri(library_url, url, builtin_lib);
   }
   if (is_dart_scheme_url) {
     ASSERT(tag == kImportTag);
@@ -343,7 +348,7 @@ Dart_Handle DartUtils::LibraryTagHandler(Dart_LibraryTag tag,
 
 static Dart_Handle ReadSource(Dart_Handle script_uri,
                               Dart_Handle builtin_lib) {
-  Dart_Handle script_path = FilePathFromUri(script_uri, builtin_lib);
+  Dart_Handle script_path = DartUtils::FilePathFromUri(script_uri, builtin_lib);
   if (Dart_IsError(script_path)) {
     return script_path;
   }