commit 0aa504b5bb19f0944d50941b20c8eeaca4165328
author Brian Carlstrom <bdc@google.com> Fri May 23 02:47:28 2014 -0700
committer Brian Carlstrom <bdc@google.com> Fri May 23 13:52:01 2014 -0700
tree 8ec437c95a023c649dc96d9e88e2403d93c77392
parent 52925af1e3136bcf68bc5754fbfa407950235217

Fix ExtractToMemMap to show original zip file name in ashmem

(cherry picked from commit 1fca8e91f32dc8b13d3129b7ef4a0194839736e6)

Change-Id: Id7d22600496b090ac32150c8c6424da89964b6be

runtime/zip_archive.h

diff --git a/runtime/zip_archive.h b/runtime/zip_archive.h
index c0e2f2f..865af51 100644
--- a/runtime/zip_archive.h
+++ b/runtime/zip_archive.h
@@ -37,7 +37,8 @@
 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();