Fix bug in OatFileAssistant::GetBestOatFile.
Previously, GetBestOatFile would fail to return an oat file in the
case where a non-executable oat file was requested and the only
problem with the oat file was that it wasn't relocated.
Bug: 22561444
Change-Id: I6446bf474afaf6c97861e7a89bd74a07c5a52a21
diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc
index 570c59c..adb6851 100644
--- a/runtime/oat_file_assistant_test.cc
+++ b/runtime/oat_file_assistant_test.cc
@@ -470,6 +470,10 @@
EXPECT_TRUE(oat_file_assistant.OatFileIsOutOfDate());
EXPECT_FALSE(oat_file_assistant.OatFileIsUpToDate());
EXPECT_TRUE(oat_file_assistant.HasOriginalDexFiles());
+
+ // We should still be able to get the non-executable odex file to run from.
+ std::unique_ptr<OatFile> oat_file = oat_file_assistant.GetBestOatFile();
+ ASSERT_TRUE(oat_file.get() != nullptr);
}
// Case: We have a stripped DEX file and an ODEX file, but no OAT file.