Revert "VIXL simulator for ART (Stage1)"
This reverts commit 48ca6a681efe1fa1cf82d8af918bf9bbfd35ae96.
Reason for revert: broken build 6685551 on aosp-master on full-eng
Bug: 161440641
Change-Id: I849fe53f56c4786f0f2a1605cbfd215559f11072
diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc
index 1480c1d..85992ea 100644
--- a/runtime/oat_file_manager.cc
+++ b/runtime/oat_file_manager.cc
@@ -236,10 +236,10 @@
std::unique_ptr<ClassLoaderContext> context(
ClassLoaderContext::CreateContextForClassLoader(class_loader, dex_elements));
- OatFileAssistant oat_file_assistant(dex_location,
- Runtime::GetQuickCodeISA(),
- runtime->GetOatFilesExecutable(),
- only_use_system_oat_files_);
+ OatFileAssistant oat_file_assistant(dex_location,
+ kRuntimeISA,
+ runtime->GetOatFilesExecutable(),
+ only_use_system_oat_files_);
// Get the oat file on disk.
std::unique_ptr<const OatFile> oat_file(oat_file_assistant.GetBestOatFile().release());