commit d5c4f8723c2b2c85b588fa07a5d4e7afb671d257
author Adam Lesinski <adamlesinski@google.com> Tue Apr 21 13:56:10 2015 -0700
committer Adam Lesinski <adamlesinski@google.com> Wed Apr 22 17:34:55 2015 -0700
tree 33d2fcaa40a7abf16041ceb522b799ef5534a97f
parent d981c0d4f01bb25ba378e865952cf9d48109b9fe

Properly mangle file names

Change-Id: I49c0f82e8c06f056198eb64b8369d83403b74321

tools/aapt2/ZipEntry.h

diff --git a/tools/aapt2/ZipEntry.h b/tools/aapt2/ZipEntry.h
index d048a3e..2745a43 100644
--- a/tools/aapt2/ZipEntry.h
+++ b/tools/aapt2/ZipEntry.h
@@ -171,9 +171,10 @@
 
     /*
      * Initialize the structure with the contents of a ZipEntry from
-     * another file.
+     * another file. If fileName is non-NULL, override the name with fileName.
      */
-    status_t initFromExternal(const ZipFile* pZipFile, const ZipEntry* pEntry);
+    status_t initFromExternal(const ZipFile* pZipFile, const ZipEntry* pEntry,
+                              const char* fileName);
 
     /*
      * Add some pad bytes to the LFH.  We do this by adding or resizing