- reorganize DartUtils::PrepareForScriptLoading so that it does not have the wait for service load …

runtime/bin/vmservice_impl.cc

 // Copyright (c) 2013, 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.
 
 #include "bin/vmservice_impl.h"
 
 #include "include/dart_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 164 matching lines @@
 
 bool VmService::Setup(const char* server_ip,
                       intptr_t server_port,
                       bool running_precompiled) {
   Dart_Isolate isolate = Dart_CurrentIsolate();
   ASSERT(isolate != NULL);
   SetServerIPAndPort("", 0);
 
   Dart_Handle result;
 
-  Dart_Handle builtin_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
-  SHUTDOWN_ON_ERROR(builtin_lib);
-
-  // Prepare for script loading by setting up the 'print' and 'timer'
-  // closures and setting up 'package root' for URI resolution.
-  result = DartUtils::PrepareForScriptLoading(
-      NULL, NULL, true, false, builtin_lib);
+  // Prepare builtin and its dependent libraries for use to resolve URIs.
+  // Set up various closures, e.g: printing, timers etc.
+  // Set up 'package root' for URI resolution.
+  result = DartUtils::PrepareForScriptLoading(true, false);
   SHUTDOWN_ON_ERROR(result);
 
   if (running_precompiled) {
     Dart_Handle url = DartUtils::NewString(kVMServiceIOLibraryUri);
     Dart_Handle library = Dart_LookupLibrary(url);
     SHUTDOWN_ON_ERROR(library);
     result = Dart_SetRootLibrary(library);
     SHUTDOWN_ON_ERROR(library);
     result = Dart_SetNativeResolver(library, VmServiceIONativeResolver, NULL);
     SHUTDOWN_ON_ERROR(result);
@@ skipping 153 matching lines @@
   Dart_Handle source = GetSource(url_string);
   if (Dart_IsError(source)) {
     return source;
   }
   return Dart_LoadSource(library, url, source, 0, 0);
 }
 
 
 }  // namespace bin
 }  // namespace dart