summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Yusuke Sato <yusukes@google.com> 2015-08-05 17:46:18 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-08-05 17:46:18 +0000
commita024acb8bab7e0e04f709fc9f927575f448e11db (patch)
tree76bdfa86e39f032e02413576702b5f76427ba44f /libs/androidfw/ZipFileRO.cpp
parentbc04d3acba766c1440e2ab0763aa1352efcf54a8 (diff)
parent957c23775f46c26142bc6d4f9a592ac4586a9ef8 (diff)
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
-rw-r--r--libs/androidfw/ZipFileRO.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index bdb659c38b42..37aae524d889 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -127,9 +127,17 @@ bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod,
bool ZipFileRO::startIteration(void** cookie)
{
+ return startIteration(cookie, NULL, NULL);
+}
+
+bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix)
+{
_ZipEntryRO* ze = new _ZipEntryRO;
+ ZipString pe(prefix ? prefix : "");
+ ZipString se(suffix ? suffix : "");
int32_t error = StartIteration(mHandle, &(ze->cookie),
- NULL /* prefix */, NULL /* suffix */);
+ prefix ? &pe : NULL,
+ suffix ? &se : NULL);
if (error) {
ALOGW("Could not start iteration over %s: %s", mFileName, ErrorCodeString(error));
delete ze;