Merge "Support running without a boot image."

1 files changed, 6 insertions, 0 deletions

diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 5e61696d2a..7ac5bceda2 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -225,6 +225,7 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize
   is_zygote_ = false;
   must_relocate_ = kDefaultMustRelocate;
   dex2oat_enabled_ = true;
+  image_dex2oat_enabled_ = true;
   if (kPoisonHeapReferences) {
     // kPoisonHeapReferences currently works only with the interpreter only.
     // TODO: make it work with the compiler.
@@ -439,6 +440,10 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize
       dex2oat_enabled_ = false;
     } else if (option == "-Xdex2oat") {
       dex2oat_enabled_ = true;
+    } else if (option == "-Xnoimage-dex2oat") {
+      image_dex2oat_enabled_ = false;
+    } else if (option == "-Ximage-dex2oat") {
+      image_dex2oat_enabled_ = true;
     } else if (option == "-Xint") {
       interpreter_only_ = true;
     } else if (StartsWith(option, "-Xgc:")) {
@@ -796,6 +801,7 @@ void ParsedOptions::Usage(const char* fmt, ...) {
   UsageMessage(stream, "  -Xpatchoat:filename\n");
   UsageMessage(stream, "  -X[no]relocate\n");
   UsageMessage(stream, "  -X[no]dex2oat (Whether to invoke dex2oat on the application)\n");
+  UsageMessage(stream, "  -X[no]image-dex2oat (Whether to create and use a boot image)\n");
   UsageMessage(stream, "\n");
 
   UsageMessage(stream, "The following previously supported Dalvik options are ignored:\n");