Rename -Xjit / -Xnojit options to -Xusejit:<boolean>
Bug: 17950037
Change-Id: I9182820240c8bbc2fa4767f6361ab3b7f1083a31
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 9d87ed7..607569a 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -146,8 +146,9 @@
.Define({"-XX:EnableHSpaceCompactForOOM", "-XX:DisableHSpaceCompactForOOM"})
.WithValues({true, false})
.IntoKey(M::EnableHSpaceCompactForOOM)
- .Define({"-Xjit", "-Xnojit"})
- .WithValues({true, false})
+ .Define("-Xusejit:_")
+ .WithType<bool>()
+ .WithValueMap({{"false", false}, {"true", true}})
.IntoKey(M::UseJIT)
.Define("-Xjitcodecachesize:_")
.WithType<MemoryKiB>()
@@ -642,8 +643,7 @@
UsageMessage(stream, " -Xcompiler-option dex2oat-option\n");
UsageMessage(stream, " -Ximage-compiler-option dex2oat-option\n");
UsageMessage(stream, " -Xpatchoat:filename\n");
- UsageMessage(stream, " -Xjit\n");
- UsageMessage(stream, " -Xnojit\n");
+ UsageMessage(stream, " -Xusejit:booleanvalue\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");