diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-06 01:29:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-06 01:29:34 +0000 |
| commit | de67540e7e2f681d1b35636ed94137506c1134ba (patch) | |
| tree | 2d5e032d3bee98413199461a283cab21e07f2c82 | |
| parent | 17b8a7ae501c2e55062db79c0ea538d9061e1ee6 (diff) | |
| parent | 1972a8ed19577edbf5d96fc587747d5b821979c4 (diff) | |
| download | art-de67540e7e2f681d1b35636ed94137506c1134ba.zip art-de67540e7e2f681d1b35636ed94137506c1134ba.tar.gz art-de67540e7e2f681d1b35636ed94137506c1134ba.tar.bz2 | |
Merge "Rename -Xjit / -Xnojit options to -Xusejit:<boolean>"
| -rw-r--r-- | runtime/parsed_options.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ std::unique_ptr<RuntimeParser> ParsedOptions::MakeParser(bool ignore_unrecognize .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 @@ void ParsedOptions::Usage(const char* fmt, ...) { 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"); |