diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-23 02:47:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-23 13:52:01 -0700 |
| commit | 0aa504b5bb19f0944d50941b20c8eeaca4165328 (patch) | |
| tree | 8ec437c95a023c649dc96d9e88e2403d93c77392 /runtime/zip_archive.cc | |
| parent | 52925af1e3136bcf68bc5754fbfa407950235217 (diff) | |
| download | art-0aa504b5bb19f0944d50941b20c8eeaca4165328.zip art-0aa504b5bb19f0944d50941b20c8eeaca4165328.tar.gz art-0aa504b5bb19f0944d50941b20c8eeaca4165328.tar.bz2 | |
Fix ExtractToMemMap to show original zip file name in ashmem
(cherry picked from commit 1fca8e91f32dc8b13d3129b7ef4a0194839736e6)
Change-Id: Id7d22600496b090ac32150c8c6424da89964b6be
Diffstat (limited to 'runtime/zip_archive.cc')
| -rw-r--r-- | runtime/zip_archive.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/zip_archive.cc b/runtime/zip_archive.cc index 841c01a..c02f310 100644 --- a/runtime/zip_archive.cc +++ b/runtime/zip_archive.cc @@ -50,13 +50,14 @@ bool ZipEntry::ExtractToFile(File& file, std::string* error_msg) { return true; } -MemMap* ZipEntry::ExtractToMemMap(const char* entry_filename, std::string* error_msg) { +MemMap* ZipEntry::ExtractToMemMap(const char* zip_filename, const char* entry_filename, + std::string* error_msg) { std::string name(entry_filename); name += " extracted in memory from "; - name += entry_filename; + name += zip_filename; std::unique_ptr<MemMap> map(MemMap::MapAnonymous(name.c_str(), - NULL, GetUncompressedLength(), - PROT_READ | PROT_WRITE, false, error_msg)); + NULL, GetUncompressedLength(), + PROT_READ | PROT_WRITE, false, error_msg)); if (map.get() == nullptr) { DCHECK(!error_msg->empty()); return nullptr; |