diff options
| author | 2022-01-10 09:48:55 +0000 | |
|---|---|---|
| committer | 2022-01-12 13:45:33 +0000 | |
| commit | 84caad6a6af9052eb8f4feeaf93b510922d20a08 (patch) | |
| tree | 61cfb68aed0db8e59245a93627343cb870f33546 /runtime/vdex_file.cc | |
| parent | 7ef64b191b546c607f510699f98f99d3b2995002 (diff) | |
Reland "Remove old unquickening of vdex logic."
This reverts commit dcf9570d756aa74a2330406c13330c18c34e0db2.
Bug: 170086509
Reason for revert: Fix handling of input-vdex file.
Change-Id: Idbd59d4fe2be672858f33668a8564933518c28df
Diffstat (limited to 'runtime/vdex_file.cc')
| -rw-r--r-- | runtime/vdex_file.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/runtime/vdex_file.cc b/runtime/vdex_file.cc index 1bf64934e7..77647fb046 100644 --- a/runtime/vdex_file.cc +++ b/runtime/vdex_file.cc @@ -75,7 +75,6 @@ std::unique_ptr<VdexFile> VdexFile::OpenAtAddress(uint8_t* mmap_addr, const std::string& vdex_filename, bool writable, bool low_4gb, - bool unquicken, std::string* error_msg) { ScopedTrace trace(("VdexFile::OpenAtAddress " + vdex_filename).c_str()); if (!OS::FileExists(vdex_filename.c_str())) { @@ -109,7 +108,6 @@ std::unique_ptr<VdexFile> VdexFile::OpenAtAddress(uint8_t* mmap_addr, vdex_filename, writable, low_4gb, - unquicken, error_msg); } @@ -121,7 +119,6 @@ std::unique_ptr<VdexFile> VdexFile::OpenAtAddress(uint8_t* mmap_addr, const std::string& vdex_filename, bool writable, bool low_4gb, - bool unquicken, std::string* error_msg) { if (mmap_addr != nullptr && mmap_size < vdex_length) { *error_msg = StringPrintf("Insufficient pre-allocated space to mmap vdex: %zu and %zu", @@ -130,7 +127,6 @@ std::unique_ptr<VdexFile> VdexFile::OpenAtAddress(uint8_t* mmap_addr, return nullptr; } CHECK(!mmap_reuse || mmap_addr != nullptr); - CHECK(!(writable && unquicken)) << "We don't want to be writing unquickened files out to disk!"; // Start as PROT_WRITE so we can mprotect back to it if we want to. MemMap mmap = MemMap::MapFileAtAddress( mmap_addr, |