Remove 'dart:io' import in builtin.dart

runtime/bin/dartutils.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.
 
 #include "bin/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
@@ skipping 29 matching lines @@
 
 static bool IsWindowsHost() {
 #if defined(TARGET_OS_WINDOWS)
   return true;
 #else  // defined(TARGET_OS_WINDOWS)
   return false;
 #endif  // defined(TARGET_OS_WINDOWS)
 }
 
 
-// Experimental flag that offloads all script loading I/O onto
-// the service isolate. Disabled for now.
-#define LOAD_VIA_SERVICE_ISOLATE
-
 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.
   intptr_t len = strlen(url_string);
   for (intptr_t idx = 0; idx < url_mapping->count(); idx++) {
     const char* url_name = url_mapping->GetArgument(idx);
     if (!strncmp(url_string, url_name, len) && (url_name[len] == ',')) {
       const char* url_mapped_name = url_name + len + 1;
@@ skipping 412 matching lines @@
   // Write a magic number and version information into the snapshot file.
   bool bytes_written = file->WriteFully(magic_number, sizeof(magic_number));
   ASSERT(bytes_written);
 }
 
 
 Dart_Handle DartUtils::LoadScript(const char* script_uri,
                                   Dart_Handle builtin_lib) {
   Dart_Handle uri = Dart_NewStringFromCString(script_uri);
 
-#if defined(LOAD_VIA_SERVICE_ISOLATE)
   Dart_Port load_port = Dart_ServiceWaitForLoadPort();
   if (load_port == ILLEGAL_PORT) {
     return NewDartUnsupportedError("Service did not return load port.");
   }
   Builtin::SetLoadPort(load_port);
-#endif
 
   return LoadDataAsync_Invoke(Dart_Null(), uri, Dart_Null(), builtin_lib);
 }
 
 
 // Callback function, gets called from asynchronous script and library
 // reading code when there is an i/o error.
 void FUNCTION_NAME(Builtin_AsyncLoadError)(Dart_NativeArguments args) {
   //  Dart_Handle source_uri = Dart_GetNativeArgument(args, 0);
   Dart_Handle library_uri = Dart_GetNativeArgument(args, 1);
@@ skipping 105 matching lines @@
   const char* suffix = Platform::LibraryExtension();
   ASSERT(suffix != NULL);
   Dart_Handle res = Dart_NewStringFromCString(suffix);
   if (Dart_IsError(res)) {
     Dart_PropagateError(res);
   }
   Dart_SetReturnValue(args, res);
 }
 
 
+void FUNCTION_NAME(Builtin_GetCurrentDirectory)(Dart_NativeArguments args) {
+  char* current = Directory::Current();
+  if (current != NULL) {
+    Dart_SetReturnValue(args, DartUtils::NewString(current));
+    free(current);
+  } else {
+    Dart_Handle err = DartUtils::NewError("Failed to get current directory.");
+    Dart_PropagateError(err);
+  }
+}
+
+
 void DartUtils::PrepareBuiltinLibrary(Dart_Handle builtin_lib,
                                       Dart_Handle internal_lib,
                                       bool is_service_isolate,
                                       const char* package_root) {
   // Setup the internal library's 'internalPrint' function.
   Dart_Handle print = Dart_Invoke(
       builtin_lib, NewString("_getPrintClosure"), 0, NULL);
   DART_CHECK_VALID(print);
   Dart_Handle result =
       Dart_SetField(internal_lib, NewString("_printClosure"), print);
   DART_CHECK_VALID(result);
 
   if (!is_service_isolate) {
     result =
         Dart_SetField(builtin_lib, NewString("_isWindows"),
                       IsWindowsHost() ? Dart_True() : Dart_False());
     DART_CHECK_VALID(result);
   }
 
-#if defined(LOAD_VIA_SERVICE_ISOLATE)
-  result = Dart_SetField(builtin_lib, NewString("_load_via_service_isolate"),
-                         Dart_True());
-  DART_CHECK_VALID(result);
-#endif
-
   if (!is_service_isolate) {
     // Set current working directory.
     result = SetWorkingDirectory(builtin_lib);
     DART_CHECK_VALID(result);
   }
 
   // Set up package root if specified.
   if (package_root != NULL) {
     result = NewString(package_root);
     DART_CHECK_VALID(result);
@@ skipping 542 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart