diff options
| author | 2019-05-03 22:43:12 -0700 | |
|---|---|---|
| committer | 2019-05-06 23:45:14 +0000 | |
| commit | 1389dd450eb257bbe48e94b2917c60d64fa10fe7 (patch) | |
| tree | da3f8ca00f986719b8e4fb111433244359d06088 | |
| parent | b2a8964f4218c2c52dacf599ebf5cf69f8753bf0 (diff) | |
Track libziparchive API change.
Bug: http://b/129068177
Test: treehugger
Change-Id: I6632e246bf76f535a14de5e521bcdf65481ef544
| -rw-r--r-- | libartbase/base/zip_archive.cc | 2 | ||||
| -rw-r--r-- | libdexfile/dex/dex_file_loader.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libartbase/base/zip_archive.cc b/libartbase/base/zip_archive.cc index 5056edc607..c899039566 100644 --- a/libartbase/base/zip_archive.cc +++ b/libartbase/base/zip_archive.cc @@ -258,7 +258,7 @@ ZipEntry* ZipArchive::Find(const char* name, std::string* error_msg) const { // Resist the urge to delete the space. <: is a bigraph sequence. std::unique_ptr< ::ZipEntry> zip_entry(new ::ZipEntry); - const int32_t error = FindEntry(handle_, ZipString(name), zip_entry.get()); + const int32_t error = FindEntry(handle_, name, zip_entry.get()); if (error) { *error_msg = std::string(ErrorCodeString(error)); return nullptr; diff --git a/libdexfile/dex/dex_file_loader.cc b/libdexfile/dex/dex_file_loader.cc index a719d4176b..54b90d3d0c 100644 --- a/libdexfile/dex/dex_file_loader.cc +++ b/libdexfile/dex/dex_file_loader.cc @@ -123,7 +123,7 @@ class DexZipArchive { DCHECK(name != nullptr); // Resist the urge to delete the space. <: is a bigraph sequence. std::unique_ptr< ::ZipEntry> zip_entry(new ::ZipEntry); - const int32_t error = FindEntry(handle_, ZipString(name), zip_entry.get()); + const int32_t error = FindEntry(handle_, name, zip_entry.get()); if (error) { *error_msg = std::string(ErrorCodeString(error)); return nullptr; |