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

diff --git a/tools/aapt2/ZipFile.cpp b/tools/aapt2/ZipFile.cpp
index 41e59cf..268c15e 100644
--- a/tools/aapt2/ZipFile.cpp
+++ b/tools/aapt2/ZipFile.cpp
@@ -546,7 +546,7 @@
  * If "ppEntry" is non-NULL, a pointer to the new entry will be returned.
  */
 status_t ZipFile::add(const ZipFile* pSourceZip, const ZipEntry* pSourceEntry,
-    int padding, ZipEntry** ppEntry)
+                      const char* storageName, int padding, ZipEntry** ppEntry)
 {
     ZipEntry* pEntry = NULL;
     status_t result;
@@ -570,9 +570,10 @@
         goto bail;
     }
 
-    result = pEntry->initFromExternal(pSourceZip, pSourceEntry);
-    if (result != NO_ERROR)
+    result = pEntry->initFromExternal(pSourceZip, pSourceEntry, storageName);
+    if (result != NO_ERROR) {
         goto bail;
+    }
     if (padding != 0) {
         result = pEntry->addPadding(padding);
         if (result != NO_ERROR)