diff options
Diffstat (limited to 'runtime/dex_file.cc')
| -rw-r--r-- | runtime/dex_file.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc index edd8bfeefb..8685d8e73c 100644 --- a/runtime/dex_file.cc +++ b/runtime/dex_file.cc @@ -340,11 +340,11 @@ std::unique_ptr<const DexFile> DexFile::OpenMemory(const uint8_t* base, const std::string& location, uint32_t location_checksum, MemMap* mem_map, - const OatFile* oat_file, + const OatDexFile* oat_dex_file, std::string* error_msg) { CHECK_ALIGNED(base, 4); // various dex file structures must be word aligned std::unique_ptr<DexFile> dex_file( - new DexFile(base, size, location, location_checksum, mem_map, oat_file)); + new DexFile(base, size, location, location_checksum, mem_map, oat_dex_file)); if (!dex_file->Init(error_msg)) { dex_file.reset(); } @@ -355,7 +355,7 @@ DexFile::DexFile(const uint8_t* base, size_t size, const std::string& location, uint32_t location_checksum, MemMap* mem_map, - const OatFile* oat_file) + const OatDexFile* oat_dex_file) : begin_(base), size_(size), location_(location), @@ -370,7 +370,7 @@ DexFile::DexFile(const uint8_t* base, size_t size, class_defs_(reinterpret_cast<const ClassDef*>(base + header_->class_defs_off_)), find_class_def_misses_(0), class_def_index_(nullptr), - oat_file_(oat_file) { + oat_dex_file_(oat_dex_file) { CHECK(begin_ != NULL) << GetLocation(); CHECK_GT(size_, 0U) << GetLocation(); } |