summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkAssets.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-05-09 14:54:13 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-09 14:54:13 -0700
commitb17db5960e2073c64ae0980a2221a709a3e7a890 (patch)
tree787ec0aadb7bd80071136e7aacc805f59eac27e4 /libs/androidfw/ApkAssets.cpp
parent4c4ac1c2b1f301bd27f1d9abe15936185af2126a (diff)
parent71e79a2396a0fa32063ae6e46b866d91b12d6196 (diff)
Merge "Track libziparchive API change."
am: 71e79a2396 Change-Id: Ia408edd9d3c0ad497dabccf11073886bb9edf8df
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
-rw-r--r--libs/androidfw/ApkAssets.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp
index 47b7d646d79f..7ba7828d71c4 100644
--- a/libs/androidfw/ApkAssets.cpp
+++ b/libs/androidfw/ApkAssets.cpp
@@ -206,9 +206,8 @@ bool ApkAssets::ForEachFile(const std::string& root_path,
root_path_full += '/';
}
- ::ZipString prefix(root_path_full.c_str());
void* cookie;
- if (::StartIteration(zip_handle_.get(), &cookie, &prefix, nullptr) != 0) {
+ if (::StartIteration(zip_handle_.get(), &cookie, root_path_full, "") != 0) {
return false;
}