diff options
Diffstat (limited to 'dex2oat/dex2oat.cc')
| -rw-r--r-- | dex2oat/dex2oat.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index d901c01fc8..dc123e489b 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -732,11 +732,6 @@ class Dex2Oat final { compiler_options_->boot_image_ = !image_filenames_.empty(); compiler_options_->app_image_ = app_image_fd_ != -1 || !app_image_file_name_.empty(); - if (IsBootImage() && image_filenames_.size() == 1) { - const std::string& boot_image_filename = image_filenames_[0]; - compiler_options_->core_image_ = CompilerDriver::IsCoreImageFilename(boot_image_filename); - } - if (IsAppImage() && IsBootImage()) { Usage("Can't have both --image and (--app-image-fd or --app-image-file)"); } @@ -951,6 +946,9 @@ class Dex2Oat final { } } compiler_options_->passes_to_run_ = passes_to_run_.get(); + compiler_options_->compiling_with_core_image_ = + !boot_image_filename_.empty() && + CompilerDriver::IsCoreImageFilename(boot_image_filename_); } static bool SupportsDeterministicCompilation() { @@ -1055,9 +1053,6 @@ class Dex2Oat final { oss << argv[i]; } key_value_store_->Put(OatHeader::kDex2OatCmdLineKey, oss.str()); - oss.str(""); // Reset. - oss << kRuntimeISA; - key_value_store_->Put(OatHeader::kDex2OatHostKey, oss.str()); } key_value_store_->Put( OatHeader::kDebuggableKey, |