Refactor OatFileAssistant to allow it to function without a runtime.

After this change, OatFileAssistant accepts an optional input
OatFileAssistant::RuntimeOptions, and when the input is provided,
OatFileAssistant can function without a runtime.

Also:
- Update tests to verify that OatFileAssistant works properly with and
  without a runtime.

Bug: 233383589
Test: atest art_standalone_runtime_tests:OatFileAssistantTest
Change-Id: Ie828a37f5f3c0843cf33cc40b07420eba0ee6dd0

1 files changed, 2 insertions, 0 deletions

diff --git a/dexoptanalyzer/dexoptanalyzer.cc b/dexoptanalyzer/dexoptanalyzer.cc
index 0cc2cdb03a..7d0aff0cbb 100644
--- a/dexoptanalyzer/dexoptanalyzer.cc
+++ b/dexoptanalyzer/dexoptanalyzer.cc
@@ -324,6 +324,7 @@ class DexoptAnalyzer final {
                                                             class_loader_context.get(),
                                                             /*load_executable=*/ false,
                                                             /*only_load_trusted_executable=*/ false,
+                                                            /*runtime_options=*/ nullptr,
                                                             vdex_fd_,
                                                             oat_fd_,
                                                             zip_fd_);
@@ -395,6 +396,7 @@ class DexoptAnalyzer final {
                                                   ArrayRef<const std::string>(bcp),
                                                   ArrayRef<const int>(bcp_fds),
                                                   runtime->GetInstructionSet(),
+                                                  runtime->GetApexVersions(),
                                                   &error_msg)) {
       LOG(INFO) << "Failed to verify boot class path checksums: " << error_msg;
       return ReturnCode::kDex2OatFromScratch;