commit 64ad14dbe2225441fb7734bf6d89358d96692eea
author Alex Light <allight@google.com> Tue Aug 19 14:23:13 2014 -0700
committer Alex Light <allight@google.com> Mon Aug 25 10:36:26 2014 -0700
tree 8992ebe906a4a0040502132aa9c77628a0a5ced6
parent 688d4a42ff5ab3bcb28d516afcb80b79c392e8e4

Support running without a boot image.

Bug: 17000769

Change-Id: I6404d5050c8a2f4ee6e70d58532eb25ee9de248e

runtime/runtime.h

diff --git a/runtime/runtime.h b/runtime/runtime.h
index 34ccdcb..784241e 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -107,7 +107,11 @@
   }
 
   bool IsDex2OatEnabled() const {
-    return dex2oat_enabled_;
+    return dex2oat_enabled_ && IsImageDex2OatEnabled();
+  }
+
+  bool IsImageDex2OatEnabled() const {
+    return image_dex2oat_enabled_;
   }
 
   CompilerCallbacks* GetCompilerCallbacks() {
@@ -509,6 +513,7 @@
   bool is_concurrent_gc_enabled_;
   bool is_explicit_gc_disabled_;
   bool dex2oat_enabled_;
+  bool image_dex2oat_enabled_;
 
   std::string compiler_executable_;
   std::string patchoat_executable_;