diff options
| author | Narayan Kamath <narayan@google.com> | 2013-11-28 14:06:24 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2013-12-09 10:19:24 +0000 |
| commit | 92572be7f754c213e615a62955cc5f65ca8c0c0e (patch) | |
| tree | 5d9266c16a5b110bacf1ec6062a46a3e33e16bcb /runtime/zip_archive_test.cc | |
| parent | 1a7e7d6a885bded1ffcdc8ff2490632698dc5139 (diff) | |
| download | art-92572be7f754c213e615a62955cc5f65ca8c0c0e.zip art-92572be7f754c213e615a62955cc5f65ca8c0c0e.tar.gz art-92572be7f754c213e615a62955cc5f65ca8c0c0e.tar.bz2 | |
Use libziparchive for art zip processing.
This is part of the effort to move all VM & framework
zip parsing to a common implementation. This also has
the side effect of fixing various TODOs related to
crc32 checking.
bug: 10193060
Change-Id: I407f9ad5a94fc91d96ff43556adde00a00df1f14
Diffstat (limited to 'runtime/zip_archive_test.cc')
| -rw-r--r-- | runtime/zip_archive_test.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/zip_archive_test.cc b/runtime/zip_archive_test.cc index 622dc89..16394b0 100644 --- a/runtime/zip_archive_test.cc +++ b/runtime/zip_archive_test.cc @@ -19,6 +19,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> +#include <zlib.h> #include "UniquePtr.h" #include "common_test.h" @@ -33,8 +34,9 @@ TEST_F(ZipArchiveTest, FindAndExtract) { UniquePtr<ZipArchive> zip_archive(ZipArchive::Open(GetLibCoreDexFileName().c_str(), &error_msg)); ASSERT_TRUE(zip_archive.get() != false) << error_msg; ASSERT_TRUE(error_msg.empty()); - UniquePtr<ZipEntry> zip_entry(zip_archive->Find("classes.dex")); + UniquePtr<ZipEntry> zip_entry(zip_archive->Find("classes.dex", &error_msg)); ASSERT_TRUE(zip_entry.get() != false); + ASSERT_TRUE(error_msg.empty()); ScratchFile tmp; ASSERT_NE(-1, tmp.GetFd()); |