diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-12 22:45:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-12 22:45:41 +0000 |
| commit | 653bc0eaff1a7f8ca057e03c3379fe22a9b523c2 (patch) | |
| tree | f3dc11fe40f942a2e5777ad1d2bedd8bc2ca5f46 /runtime/parsed_options.cc | |
| parent | 0c5e8417a1e82f6e31fbfc33be7e64d9073d6ef4 (diff) | |
| parent | b9beb2e2efb6a204a69ca660d478b45f851e8f09 (diff) | |
| download | art-653bc0eaff1a7f8ca057e03c3379fe22a9b523c2.zip art-653bc0eaff1a7f8ca057e03c3379fe22a9b523c2.tar.gz art-653bc0eaff1a7f8ca057e03c3379fe22a9b523c2.tar.bz2 | |
Merge "Place ISA into boot image name."
Diffstat (limited to 'runtime/parsed_options.cc')
| -rw-r--r-- | runtime/parsed_options.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index ff3e7b6..8c18dff 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -682,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_; |