Do not initialize the JIT if it is not the designated execution mode.
diff --git a/vm/Init.c b/vm/Init.c
index 0710a55..7f83bc5 100644
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -1368,8 +1368,10 @@
(int)(endJdwp-startJdwp), (int)(endJdwp-startHeap));
#ifdef WITH_JIT
- if (!dvmJitStartup())
- return false;
+ if (gDvm.executionMode == kExecutionModeJit) {
+ if (!dvmJitStartup())
+ return false;
+ }
#endif
return true;
@@ -1558,8 +1560,10 @@
dvmStdioConverterShutdown();
#ifdef WITH_JIT
- /* tell the compiler to shut down if it was started */
- dvmJitShutdown();
+ if (gDvm.executionMode == kExecutionModeJit) {
+ /* shut down the compiler thread */
+ dvmJitShutdown();
+ }
#endif
/*