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.h | |
| parent | 52925af1e3136bcf68bc5754fbfa407950235217 (diff) | |
| download | art-0aa504b5bb19f0944d50941b20c8eeaca4165328.tar.gz art-0aa504b5bb19f0944d50941b20c8eeaca4165328.tar.bz2 art-0aa504b5bb19f0944d50941b20c8eeaca4165328.zip | |
Fix ExtractToMemMap to show original zip file name in ashmem
(cherry picked from commit 1fca8e91f32dc8b13d3129b7ef4a0194839736e6)
Change-Id: Id7d22600496b090ac32150c8c6424da89964b6be
Diffstat (limited to 'runtime/zip_archive.h')
| -rw-r--r-- | runtime/zip_archive.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/zip_archive.h b/runtime/zip_archive.h index c0e2f2f865..865af515d8 100644 --- a/runtime/zip_archive.h +++ b/runtime/zip_archive.h @@ -37,7 +37,8 @@ class MemMap; class ZipEntry { public: bool ExtractToFile(File& file, std::string* error_msg); - MemMap* ExtractToMemMap(const char* entry_filename, std::string* error_msg); + MemMap* ExtractToMemMap(const char* zip_filename, const char* entry_filename, + std::string* error_msg); virtual ~ZipEntry(); uint32_t GetUncompressedLength(); |