| Index: runtime/bin/main.cc
|
| diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
|
| index b2723ca147a55f918d6c24ea190b0cdb6b7330f6..693ab902d30f28f5c8107e305b8cc49606ecf3a3 100644
|
| --- a/runtime/bin/main.cc
|
| +++ b/runtime/bin/main.cc
|
| @@ -947,20 +947,6 @@ void main(int argc, char** argv) {
|
| // Start event handler.
|
| EventHandler::Start();
|
|
|
| - // Initialize the Dart VM.
|
| - if (!Dart_Initialize(CreateIsolateAndSetup, NULL, NULL, ShutdownIsolate,
|
| - DartUtils::OpenFile,
|
| - DartUtils::ReadFile,
|
| - DartUtils::WriteFile,
|
| - DartUtils::CloseFile,
|
| - DartUtils::EntropySource)) {
|
| - fprintf(stderr, "%s", "VM initialization failed\n");
|
| - fflush(stderr);
|
| - exit(kErrorExitCode);
|
| - }
|
| -
|
| -
|
| -
|
| // Start the debugger wire protocol handler if necessary.
|
| if (start_debugger) {
|
| ASSERT(debug_port >= 0);
|
| @@ -973,6 +959,18 @@ void main(int argc, char** argv) {
|
| DebuggerConnectionHandler::InitForVmService();
|
| }
|
|
|
| + // Initialize the Dart VM.
|
| + if (!Dart_Initialize(CreateIsolateAndSetup, NULL, NULL, ShutdownIsolate,
|
| + DartUtils::OpenFile,
|
| + DartUtils::ReadFile,
|
| + DartUtils::WriteFile,
|
| + DartUtils::CloseFile,
|
| + DartUtils::EntropySource)) {
|
| + fprintf(stderr, "%s", "VM initialization failed\n");
|
| + fflush(stderr);
|
| + exit(kErrorExitCode);
|
| + }
|
| +
|
| Dart_RegisterIsolateServiceRequestCallback(
|
| "io", &ServiceRequestHandler, NULL);
|
|
|
|
|