commit 5439f051a950f0281eeafb8e8064839f2aea6e38
author Ulya Trafimovich <skvadrik@google.com> Wed Jul 29 10:03:46 2020 +0100
committer Ulyana Trafimovich <skvadrik@google.com> Wed Jul 29 13:58:15 2020 +0000
tree 889efef779fa462357f77cb2166c600cb0d60679
parent 483bf78ae61ab43a3d513cef0de0072e86d0b0b1

Revert^3 "VIXL simulator for ART (Stage1)"

This reverts commit e886d68b9c40c941d8966b9c90d0e265c75fb19e.

Reason for revert: simulator implemention is not ready yet.

Test: lunch aosp_cf_x86_phone-userdebug && m
Test: art/test.py --run-test --optimizing --host
Change-Id: I03c8c09ea348205b0238d7a26caef3477cd6ae3b

runtime/elf_file.cc

diff --git a/runtime/elf_file.cc b/runtime/elf_file.cc
index 3c6fd85..b6aed7f 100644
--- a/runtime/elf_file.cc
+++ b/runtime/elf_file.cc
@@ -31,7 +31,6 @@
 #include "base/utils.h"
 #include "elf/elf_utils.h"
 #include "elf_file_impl.h"
-#include "runtime.h"
 
 namespace art {
 
@@ -1101,9 +1100,9 @@
 
   if (executable) {
     InstructionSet elf_ISA = GetInstructionSetFromELF(GetHeader().e_machine, GetHeader().e_flags);
-    if (elf_ISA != Runtime::GetQuickCodeISA()) {
+    if (elf_ISA != kRuntimeISA) {
       std::ostringstream oss;
-      oss << "Expected ISA " << Runtime::GetQuickCodeISA() << " but found " << elf_ISA;
+      oss << "Expected ISA " << kRuntimeISA << " but found " << elf_ISA;
       *error_msg = oss.str();
       return false;
     }