Android improvements:

runtime/embedders/openglui/common/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 <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ skipping 180 matching lines @@
 
   Dart_Handle url = CheckError(Dart_NewStringFromCString(main_script_));
   Dart_Handle source = LoadSourceFromFile(main_script_);
   CheckError(Dart_LoadScript(url, source));
 
   Dart_ExitScope();
   Dart_ExitIsolate();
   return 0;
 }
 
-int VMGlue::CallSetup() {
-  if (!initialized_script_) {
+int VMGlue::CallSetup(bool force) {
+  // TODO(gram): See if we actually need this flag guard here, or if
+  // we can eliminate it along with the need for the force parameter.
+  if (!initialized_script_ || force) {
     initialized_script_ = true;
     LOGI("Invoking setup(NULL, %d,%d)", surface_->width(), surface_->height());
     Dart_EnterIsolate(isolate_);
     Dart_EnterScope();
     Dart_Handle args[3];
     args[0] = CheckError(Dart_Null());
     args[1] = CheckError(Dart_NewInteger(surface_->width()));
     args[2] = CheckError(Dart_NewInteger(surface_->height()));
     int rtn = Invoke("setup", 3, args);
 
@@ skipping 13 matching lines @@
     Dart_ExitScope();
     Dart_ExitIsolate();
     LOGI("Done setup");
     return rtn;
   }
   return 0;
 }
 
 int VMGlue::CallUpdate() {
   if (initialized_script_) {
-    LOGI("Invoking update");
     Dart_EnterIsolate(isolate_);
     Dart_EnterScope();
     int rtn = Invoke("update", 0, 0);
     Dart_ExitScope();
     Dart_ExitIsolate();
-    LOGI("Done update");
+    return rtn;
+  }
+  return -1;
+}
+
+int VMGlue::CallShutdown() {
+  if (initialized_script_) {
+    Dart_EnterIsolate(isolate_);
+    Dart_EnterScope();
+    int rtn = Invoke("shutdown", 0, 0);
+    Dart_ExitScope();
+    Dart_ExitIsolate();
     return rtn;
   }
   return -1;
 }
 
 int VMGlue::OnMotionEvent(const char* pFunction, int64_t pWhen,
   float pMoveX, float pMoveY) {
   if (initialized_script_) {
     LOGI("Invoking %s", pFunction);
     Dart_EnterIsolate(isolate_);
@@ skipping 29 matching lines @@
     LOGI("Done %s", function);
     return rtn;
   }
   return -1;
 }
 
 int VMGlue::Invoke(const char* function,
                    int argc,
                    Dart_Handle* args,
                    bool failIfNotDefined) {
-  LOGI("in invoke(%s)", function);
-
   // Lookup the library of the root script.
-  LOGI("looking up the root library");
   Dart_Handle library = Dart_RootLibrary();
   if (Dart_IsNull(library)) {
      LOGE("Unable to find root library\n");
      return -1;
   }
 
   Dart_Handle nameHandle = Dart_NewStringFromCString(function);
 
-  LOGI("invoking %s", function);
   Dart_Handle result = Dart_Invoke(library, nameHandle, argc, args);
 
   if (Dart_IsError(result)) {
     const char* error = Dart_GetError(result);
     LOGE("Invoke %s failed: %s", function, error);
     if (failIfNotDefined) {
       return -1;
     }
   }
 
   // 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)) {
     LOGE("Dart_RunLoop: %s\n", Dart_GetError(result));
     return -1;
   }
 
-  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;
 }