Migrate files to embedder.

runtime/embedders/android/vm_glue.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 <math.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
 #include "include/dart_api.h"
-#include "jni/android_extension.h"
-#include "jni/log.h"
-#include "jni/vm_glue.h"
+#include "embedders/android/android_extension.h"
+#include "embedders/android/log.h"
+#include "embedders/android/vm_glue.h"
 
 // snapshot_buffer points to a snapshot if we link in a snapshot otherwise
 // it is initialized to NULL.
 
 VMGlue::VMGlue(Graphics* graphics)
     : graphics_(graphics),
       isolate_(NULL),
       initialized_vm_(false),
       initialized_script_(false) {
   LOGI("Creating VMGlue");
@@ skipping 21 matching lines @@
 #define CHECK_RESULT(result)                   \
   if (Dart_IsError(result)) {                  \
     *error = strdup(Dart_GetError(result));    \
     LOGE(*error);                              \
     Dart_ExitScope();                          \
     Dart_ShutdownIsolate();                    \
     return false;                              \
   }
 
 Dart_Handle VMGlue::LibraryTagHandler(Dart_LibraryTag tag,
-                                      Dart_Handle library,
-                                      Dart_Handle urlHandle) {
+                                      Dart_Handle library,
+                                      Dart_Handle urlHandle) {
   const char* url;
   Dart_StringToCString(urlHandle, &url);
   if (tag == kCanonicalizeUrl) {
     return urlHandle;
   }
   // TODO(vsm): Split this up into separate libraries for 3D, 2D,
   // Touch, Audio, etc.  All builtin libraries should be handled here
   // (or moved into a snapshot).
   if (strcmp(url, "android_extension.dart") == 0) {
-    Dart_Handle source = VMGlue::LoadSourceFromFile("/data/data/com.google.dartndk/app_dart/android_extension.dart");
+    Dart_Handle source =
+        VMGlue::LoadSourceFromFile("/data/data/com.google.dartndk/app_dart/android_extension.dart");
     Dart_Handle library = CheckError(Dart_LoadLibrary(urlHandle, source));
     CheckError(Dart_SetNativeResolver(library, ResolveName));
     return library;
   }
   LOGE("UNIMPLEMENTED: load library %s\n", url);
   return NULL;
 }
 
 // Returns true on success, false on failure.
 bool VMGlue::CreateIsolateAndSetupHelper(const char* script_uri,
                                          const char* main,
                                          void* data,
                                          char** error) {
   LOGI("Creating isolate %s, %s", script_uri, main);
   Dart_Isolate isolate =
       Dart_CreateIsolate(script_uri, main, NULL, data, error);
   if (isolate == NULL) {
-    LOGE("Couldn't create isolate: %s", error);
+    LOGE("Couldn't create isolate: %s", *error);
     return false;
   }
 
   LOGI("Entering scope");
   Dart_EnterScope();
 
   // Set up the library tag handler for this isolate.
   LOGI("Setting up library tag handler");
   Dart_Handle result = CheckError(Dart_SetLibraryTagHandler(LibraryTagHandler));
   CHECK_RESULT(result);
@@ skipping 174 matching lines @@
 
   // Lookup the library of the root script.
   LOGI("looking up the root library");
   Dart_Handle library = Dart_RootLibrary();
   if (Dart_IsNull(library)) {
      return ErrorExit("Unable to find root library\n");
   }
 
   // Lookup and invoke the appropriate function.
   LOGI("invoking %s", function);
-  result = Dart_Invoke(library, Dart_NewStringFromCString(function), argc, args);
+  result =
+      Dart_Invoke(library, Dart_NewStringFromCString(function), argc, args);
 
   if (Dart_IsError(result)) {
     return ErrorExit("%s\n", Dart_GetError(result));
   }
 
   // TODO(vsm): I don't think we need this.
   // Keep handling messages until the last active receive port is closed.
   LOGI("Entering Dart message loop");
   result = Dart_RunLoop();
   if (Dart_IsError(result)) {
     return ErrorExit("%s\n", Dart_GetError(result));
   }
 
   LOGI("out invoke");
   return 0;
 }
 
 void VMGlue::FinishMainIsolate() {
   LOGI("Finish main isolate");
   Dart_EnterIsolate(isolate_);
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   isolate_ = NULL;
   initialized_script_ = false;
 }