diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-01 19:50:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-01 19:50:16 +0000 |
| commit | a25b5fec56e065d33f6827bde1e51fc47b1f3aee (patch) | |
| tree | 7b97aaaa37ddc6db9d366e46d03a972bc6eb96eb | |
| parent | 664e46167b12d2bf44fe530a94570f053bf15f91 (diff) | |
| parent | 9106e52a47042043edfb2a0fea05f28d52903c47 (diff) | |
| download | art-a25b5fec56e065d33f6827bde1e51fc47b1f3aee.zip art-a25b5fec56e065d33f6827bde1e51fc47b1f3aee.tar.gz art-a25b5fec56e065d33f6827bde1e51fc47b1f3aee.tar.bz2 | |
Merge "ART: Set default prune counter to 10"
| -rw-r--r-- | runtime/parsed_options.cc | 2 | ||||
| -rw-r--r-- | runtime/runtime_options.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index 337c5df..89779bc 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -250,7 +250,7 @@ std::unique_ptr<RuntimeParser> ParsedOptions::MakeParser(bool ignore_unrecognize .Define("-XX:NativeBridge=_") .WithType<std::string>() .IntoKey(M::NativeBridge) - .Define("-Xzygote-max-failed-boots=_") + .Define("-Xzygote-max-boot-retry=_") .WithType<unsigned int>() .IntoKey(M::ZygoteMaxFailedBoots) .Define("-Xno-dex-file-fallback") diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def index 1f273cf..339f925 100644 --- a/runtime/runtime_options.def +++ b/runtime/runtime_options.def @@ -119,7 +119,7 @@ RUNTIME_OPTIONS_KEY (void (*)(int32_t status), \ // We don't call abort(3) by default; see // Runtime::Abort. RUNTIME_OPTIONS_KEY (void (*)(), HookAbort, nullptr) -RUNTIME_OPTIONS_KEY (unsigned int, ZygoteMaxFailedBoots, 1) +RUNTIME_OPTIONS_KEY (unsigned int, ZygoteMaxFailedBoots, 10) RUNTIME_OPTIONS_KEY (Unit, NoDexFileFallback) #undef RUNTIME_OPTIONS_KEY |