commit ad256bb4ca1740eba533d6527bad34e9a046ec00
author Anwar Ghuloum <anwarg@google.com> Thu Jul 18 14:58:55 2013 -0700
committer Anwar Ghuloum <anwarg@google.com> Thu Jul 18 15:06:44 2013 -0700
tree f245458aeebf43426579d6fbef3e4c3376317d65
parent 08524597899d0bb021c9165218deff51dc88da50

Fixing gtest failure due to VerifyClassUsingOatFile change

Change-Id: I8d4ed31fada333013a56dcb7aebbd25f5323017c

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 7cf6cd9..41ddef5 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2321,6 +2321,12 @@
 
 
   const OatFile* oat_file = FindOpenedOatFileForDexFile(dex_file);
+  // Make this work with gtests, which do not set up the image properly.
+  // TODO: we should clean up gtests to set up the image path properly.
+  if (Runtime::Current()->IsCompiler() && (oat_file == NULL)) {
+    return false;
+  }
+
   CHECK(oat_file != NULL) << dex_file.GetLocation() << " " << PrettyClass(klass);
   const OatFile::OatDexFile* oat_dex_file = oat_file->GetOatDexFile(dex_file.GetLocation());
   CHECK(oat_dex_file != NULL) << dex_file.GetLocation() << " " << PrettyClass(klass);