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.cpp

diff --git a/tools/aapt2/ZipEntry.cpp b/tools/aapt2/ZipEntry.cpp
index ad5d84a..891b4e1 100644
--- a/tools/aapt2/ZipEntry.cpp
+++ b/tools/aapt2/ZipEntry.cpp
@@ -144,9 +144,15 @@
  * Initializes the CDE and the LFH.
  */
 status_t ZipEntry::initFromExternal(const ZipFile* /* pZipFile */,
-    const ZipEntry* pEntry)
+    const ZipEntry* pEntry, const char* storageName)
 {
     mCDE = pEntry->mCDE;
+    if (storageName && *storageName != 0) {
+        mCDE.mFileNameLength = strlen(storageName);
+        mCDE.mFileName = new unsigned char[mCDE.mFileNameLength + 1];
+        strcpy((char*) mCDE.mFileName, storageName);
+    }
+
     // Check whether we got all the memory needed.
     if ((mCDE.mFileNameLength > 0 && mCDE.mFileName == NULL) ||
             (mCDE.mFileCommentLength > 0 && mCDE.mFileComment == NULL) ||