ART: Report zip opening error
Do not swallow the error message from ZipArchive::OpenFromFd.
Bug: 19574093
Change-Id: I14ea771e63b7bc3e8051012a841e66b9e894aa3a
diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc
index 19a4bd0..edd8bfe 100644
--- a/runtime/dex_file.cc
+++ b/runtime/dex_file.cc
@@ -100,7 +100,8 @@
if (IsZipMagic(magic)) {
std::unique_ptr<ZipArchive> zip_archive(ZipArchive::OpenFromFd(fd.release(), filename, error_msg));
if (zip_archive.get() == NULL) {
- *error_msg = StringPrintf("Failed to open zip archive '%s'", file_part);
+ *error_msg = StringPrintf("Failed to open zip archive '%s' (error msg: %s)", file_part,
+ error_msg->c_str());
return false;
}
std::unique_ptr<ZipEntry> zip_entry(zip_archive->Find(zip_entry_name, error_msg));