diff options
author | Elliott Hughes <enh@google.com> | 2019-05-09 16:29:49 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-09 16:29:49 -0700 |
commit | e94bde383b8fde8ddeb5bfbc7698da6010c71815 (patch) | |
tree | 9a2133b0f7e6310d511f196f66ccd3f65b7575df /libs/androidfw/ApkAssets.cpp | |
parent | 38b1fecaad1cc53351f5c5da2604ced42684e433 (diff) | |
parent | b17db5960e2073c64ae0980a2221a709a3e7a890 (diff) |
Merge "Track libziparchive API change." am: 71e79a2396
am: b17db5960e
Change-Id: I07b669391eb8030bd09529f224fefefe73a6d1f5
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
-rw-r--r-- | libs/androidfw/ApkAssets.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp index fc3fee76a582..61e32301dc85 100644 --- a/libs/androidfw/ApkAssets.cpp +++ b/libs/androidfw/ApkAssets.cpp @@ -211,9 +211,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; } |