diff options
Diffstat (limited to 'runtime/vdex_file.h')
| -rw-r--r-- | runtime/vdex_file.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/runtime/vdex_file.h b/runtime/vdex_file.h index bb9844af65..7daf2f8d7b 100644 --- a/runtime/vdex_file.h +++ b/runtime/vdex_file.h @@ -61,7 +61,7 @@ class VdexFile { private: static constexpr uint8_t kVdexMagic[] = { 'v', 'd', 'e', 'x' }; - static constexpr uint8_t kVdexVersion[] = { '0', '0', '2', '\0' }; // Handle verify-profile + static constexpr uint8_t kVdexVersion[] = { '0', '0', '3', '\0' }; // Remove verify-profile uint8_t magic_[4]; uint8_t version_[4]; @@ -73,17 +73,19 @@ class VdexFile { typedef uint32_t VdexChecksum; - static VdexFile* Open(const std::string& vdex_filename, - bool writable, - bool low_4gb, - std::string* error_msg); - - static VdexFile* Open(int file_fd, - size_t vdex_length, - const std::string& vdex_filename, - bool writable, - bool low_4gb, - std::string* error_msg); + // Returns nullptr if the vdex file cannot be opened or is not valid. + static std::unique_ptr<VdexFile> Open(const std::string& vdex_filename, + bool writable, + bool low_4gb, + std::string* error_msg); + + // Returns nullptr if the vdex file cannot be opened or is not valid. + static std::unique_ptr<VdexFile> Open(int file_fd, + size_t vdex_length, + const std::string& vdex_filename, + bool writable, + bool low_4gb, + std::string* error_msg); const uint8_t* Begin() const { return mmap_->Begin(); } const uint8_t* End() const { return mmap_->End(); } |