diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-13 19:31:38 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-14 09:25:34 -0700 |
| commit | 3ac05bba3eadccb33d26b41d9797f63e8378125f (patch) | |
| tree | 4c801c5dc41290a7e7a1cbc2915a357a416ecd7e /runtime/parsed_options.cc | |
| parent | c2ffcecb61e474f29f3c6a8721dfd00e0252b1f8 (diff) | |
| download | art-3ac05bba3eadccb33d26b41d9797f63e8378125f.zip art-3ac05bba3eadccb33d26b41d9797f63e8378125f.tar.gz art-3ac05bba3eadccb33d26b41d9797f63e8378125f.tar.bz2 | |
Remove ISA from boot image name.
Partially reverts b9beb2e2efb6a204a69ca660d478b45f851e8f09
Bug: 14882223
(cherry picked from commit 3da44327c8306bb354c0163a7c7779dea6eeb38a)
Change-Id: Idc9266a97d1047434c110ef140e2f2708c4aadef
Diffstat (limited to 'runtime/parsed_options.cc')
| -rw-r--r-- | runtime/parsed_options.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index 623b0c6..55b6a27 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -689,9 +689,7 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni if (compiler_callbacks_ == nullptr && image_.empty()) { image_ += GetAndroidRoot(); - image_ += "/framework/boot-"; - image_ += GetInstructionSetString(image_isa_); - image_ += ".art"; + image_ += "/framework/boot.art"; } if (heap_growth_limit_ == 0) { heap_growth_limit_ = heap_maximum_size_; |