summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2019-05-13 11:12:13 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-13 11:12:13 -0700
commitd47c87a2e674a804041fea4445d77a88af62ee2b (patch)
tree726c422f09e55838bd4ce9884a8e33c6776bd350
parent917c9f146b239fa4cdcbf4585dfe01751137bc37 (diff)
parent480d18c47278101db0e19eede88550899cf66b2a (diff)
Merge "Don't explicitly specify no prefix/suffix."
am: 480d18c472 Change-Id: I2c17e2010e34cc6857d48209a3d0f4f5a7dee8dc
-rw-r--r--tools/aapt2/io/ZipArchive.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/io/ZipArchive.cpp b/tools/aapt2/io/ZipArchive.cpp
index 269b6c5a12e1..550edd344aa3 100644
--- a/tools/aapt2/io/ZipArchive.cpp
+++ b/tools/aapt2/io/ZipArchive.cpp
@@ -106,7 +106,7 @@ std::unique_ptr<ZipFileCollection> ZipFileCollection::Create(
}
void* cookie = nullptr;
- result = StartIteration(collection->handle_, &cookie, nullptr, nullptr);
+ result = StartIteration(collection->handle_, &cookie);
if (result != 0) {
if (out_error) *out_error = ErrorCodeString(result);
return {};