Gets mandoline working on android

mojo/runner/android/main.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/runner/android/main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/simple_thread.h"
 #include "jni/ShellMain_jni.h"
 #include "mojo/common/message_pump_mojo.h"
 #include "mojo/runner/android/android_handler_loader.h"
 #include "mojo/runner/android/background_application_loader.h"
+#include "mojo/runner/android/context_init.h"
 #include "mojo/runner/android/native_viewport_application_loader.h"
 #include "mojo/runner/android/ui_application_loader_android.h"
 #include "mojo/runner/context.h"
 #include "mojo/runner/init.h"
 #include "mojo/shell/application_loader.h"
 #include "ui/gl/gl_surface_egl.h"
 
 using base::LazyInstance;
 
 namespace mojo {
@@ skipping 122 matching lines @@
   InitializeLogging();
 
   InitializeRedirection();
 
   // We want ~MessageLoop to happen prior to ~Context. Initializing
   // LazyInstances is akin to stack-allocating objects; their destructors
   // will be invoked first-in-last-out.
   Context* shell_context = new Context();
   shell_context->SetShellFileRoot(base::FilePath(
       base::android::ConvertJavaStringToUTF8(env, j_local_apps_directory)));
+  InitContext(shell_context);
   g_context.Get().reset(shell_context);
 
   g_java_message_loop.Get().reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 
   // TODO(abarth): At which point should we switch to cross-platform
   // initialization?
 
   gfx::GLSurface::InitializeOneOff();
 }
@@ skipping 24 matching lines @@
 }
 
 }  // namespace runner
 }  // namespace mojo
 
 // TODO(vtl): Even though main() should never be called, mojo_shell fails to
 // link without it. Figure out if we can avoid this.
 int main(int argc, char** argv) {
   NOTREACHED();
 }