- Add dart:json, dart:uri and dart:utf8 to the known and builtin libraries.

bin/gen_snapshot.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // Generate a snapshot file after loading all the scripts specified on the
 // command line.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ skipping 186 matching lines @@
   Dart_Handle lib;
   if (id == Builtin::kBuiltinLibrary) {
     // Load the dart:builtin library as the script.
     Dart_Handle url = Dart_NewString(DartUtils::kBuiltinLibURL);
     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
+    // Load the builtin library to make it available in the snapshot
     // for importing.
-    lib = Builtin::LoadLibrary(Builtin::kIOLibrary);
+    lib = Builtin::LoadLibrary(id);
   }
   if (!Dart_IsError(lib)) {
     Builtin::SetupLibrary(lib, id);
   }
   return lib;
 }
 
 
 static void PrintUsage() {
   fprintf(stderr,
@@ skipping 59 matching lines @@
   if (app_script_name != NULL) {
     // Load the specified script.
     library = LoadSnapshotCreationScript(app_script_name);
     VerifyLoaded(library);
   } else {
     // This is a generic dart snapshot which needs builtin library setup.
     library = LoadGenericSnapshotCreationScript(Builtin::kBuiltinLibrary);
     VerifyLoaded(library);
     library = LoadGenericSnapshotCreationScript(Builtin::kIOLibrary);
     VerifyLoaded(library);
+    library = LoadGenericSnapshotCreationScript(Builtin::kJsonLibrary);
+    VerifyLoaded(library);
+    library = LoadGenericSnapshotCreationScript(Builtin::kUriLibrary);
+    VerifyLoaded(library);
+    library = LoadGenericSnapshotCreationScript(Builtin::kUtf8Library);
+    VerifyLoaded(library);
   }
 
   uint8_t* buffer = NULL;
   intptr_t size = 0;
   // First create the snapshot.
   result = Dart_CreateSnapshot(&buffer, &size);
   if (Dart_IsError(result)) {
     const char* err_msg = Dart_GetError(result);
     fprintf(stderr, "Error while creating snapshot: %s\n", err_msg);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     exit(255);
   }
   // Now write the snapshot out to specified file and exit.
   WriteSnapshotFile(buffer, size);
   Dart_ExitScope();
 
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   return 0;
 }