diff options
Diffstat (limited to 'runtime/parsed_options.cc')
| -rw-r--r-- | runtime/parsed_options.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index 84ca23bae8..8c18dff0be 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -181,8 +181,16 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni parallel_gc_threads_ = sysconf(_SC_NPROCESSORS_CONF) - 1; // Only the main GC thread, no workers. conc_gc_threads_ = 0; - // Default is CMS which is Sticky + Partial + Full CMS GC. + // The default GC type is set in makefiles. +#if ART_DEFAULT_GC_TYPE_IS_CMS collector_type_ = gc::kCollectorTypeCMS; +#elif ART_DEFAULT_GC_TYPE_IS_SS + collector_type_ = gc::kCollectorTypeSS; +#elif ART_DEFAULT_GC_TYPE_IS_GSS + collector_type_ = gc::kCollectorTypeGSS; +#else +#error "ART default GC type must be set" +#endif // If background_collector_type_ is kCollectorTypeNone, it defaults to the collector_type_ after // parsing options. background_collector_type_ = gc::kCollectorTypeNone; @@ -674,7 +682,9 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni if (compiler_callbacks_ == nullptr && image_.empty()) { image_ += GetAndroidRoot(); - image_ += "/framework/boot.art"; + image_ += "/framework/boot-"; + image_ += GetInstructionSetString(image_isa_); + image_ += ".art"; } if (heap_growth_limit_ == 0) { heap_growth_limit_ = heap_maximum_size_; |