Remove now unused RelocationBehavior
Change-Id: Ifdb98a63376014a698b53bc926fb1c5512dc2e57
diff --git a/src/class_linker.cc b/src/class_linker.cc
index 9a354e1..b6a3819 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -702,9 +702,7 @@
oat_filename += runtime->GetHostPrefix();
oat_filename += oat_location->ToModifiedUtf8();
runtime->GetHeap()->UnReserveOatFileAddressRange();
- OatFile* oat_file = OatFile::Open(oat_filename, oat_filename,
- image_header.GetOatBegin(),
- OatFile::kRelocNone);
+ OatFile* oat_file = OatFile::Open(oat_filename, oat_filename, image_header.GetOatBegin());
VLOG(startup) << "ClassLinker::OpenOat entering oat_filename=" << oat_filename;
if (oat_file == NULL) {
LOG(ERROR) << "Failed to open oat file " << oat_filename << " referenced from image.";
@@ -743,8 +741,7 @@
static const DexFile* FindDexFileInOatLocation(const std::string& dex_location,
uint32_t dex_location_checksum,
const std::string& oat_location) {
- UniquePtr<OatFile> oat_file(
- OatFile::Open(oat_location, oat_location, NULL, OatFile::kRelocAll));
+ UniquePtr<OatFile> oat_file(OatFile::Open(oat_location, oat_location, NULL));
if (oat_file.get() == NULL) {
return NULL;
}
@@ -805,8 +802,7 @@
LOG(ERROR) << "Failed to seek to start of generated oat file: " << oat_location;
return NULL;
}
- const OatFile* oat_file =
- OatFile::Open(*file.get(), oat_location, NULL, OatFile::kRelocAll);
+ const OatFile* oat_file = OatFile::Open(*file.get(), oat_location, NULL);
if (oat_file == NULL) {
LOG(ERROR) << "Failed to open generated oat file: " << oat_location;
return NULL;
@@ -955,8 +951,7 @@
return oat_file;
}
- oat_file = OatFile::Open(oat_location, oat_location, NULL,
- OatFile::kRelocAll);
+ oat_file = OatFile::Open(oat_location, oat_location, NULL);
if (oat_file == NULL) {
return NULL;
}