summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
authorYusuke Sato <yusukes@google.com>2015-08-05 19:09:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-05 19:09:41 +0000
commit3251f2aab75c8c905cc59b428d99812b5575ebdb (patch)
tree548cdaec4164cdae48b5d20dd1056ff92716fcd4 /libs/androidfw/ZipFileRO.cpp
parent7581a2090e13b8bc8beef39233cf498e4ae0ba63 (diff)
parent3383b141c3ac4426279e649ebcee535890203c3f (diff)
am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
* commit '3383b141c3ac4426279e649ebcee535890203c3f': Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
-rw-r--r--libs/androidfw/ZipFileRO.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index 49fe8a261178..96eb64962b97 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -132,6 +132,11 @@ bool ZipFileRO::startIteration(void** cookie) {
bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix)
{
+ 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 : "");