Fix canonicalization of relative paths, Dart_DefaultCanonicalizeUrl expects the base)url to end wit…

runtime/bin/gen_snapshot.cc

Index: runtime/bin/gen_snapshot.cc
diff --git a/runtime/bin/gen_snapshot.cc b/runtime/bin/gen_snapshot.cc
index 0ed4c0af46ff25c8dce224dcf95e65f042a06fac..a8d04e329e9327cade023b7a46937d00fba70c6f 100644
--- a/runtime/bin/gen_snapshot.cc
+++ b/runtime/bin/gen_snapshot.cc
@@ -455,7 +455,7 @@ static Dart_Handle LoadSnapshotCreationScript(const char* script_name) {
   // First resolve the specified script uri with respect to the original
   // working directory.
   Dart_Handle resolved_uri = Dart_DefaultCanonicalizeUrl(
-      Dart_NewStringFromCString(DartUtils::original_working_directory),
+      DartUtils::GetCanonicalizableWorkingDirectory(),
       Dart_NewStringFromCString(script_name));
   if (Dart_IsError(resolved_uri)) {
     return resolved_uri;
@@ -500,7 +500,7 @@ static Dart_Handle CreateSnapshotLibraryTagHandler(Dart_LibraryTag tag,
       library_url_string);
   if (mapped_library_url_string != NULL) {
     library_url = Dart_DefaultCanonicalizeUrl(
-        Dart_NewStringFromCString(DartUtils::original_working_directory),
+        DartUtils::GetCanonicalizableWorkingDirectory(),
         Dart_NewStringFromCString(mapped_library_url_string));
     library_url_string = DartUtils::GetStringValue(library_url);
   }
@@ -547,7 +547,7 @@ static Dart_Handle CreateSnapshotLibraryTagHandler(Dart_LibraryTag tag,
   if (mapped_url_string != NULL) {
     // Mapped urls are relative to working directory.
     resolved_url = Dart_DefaultCanonicalizeUrl(
-        Dart_NewStringFromCString(DartUtils::original_working_directory),
+        DartUtils::GetCanonicalizableWorkingDirectory(),
         Dart_NewStringFromCString(mapped_url_string));
     if (Dart_IsError(resolved_url)) {
       return resolved_url;