commit 3b0667c1d68ba88c71b031757b757dca659afd69
author Andreas Gampe <agampe@google.com> Mon Jun 29 21:01:14 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 29 21:01:14 2015 +0000
tree 5125dd5693ce9e4acc5913c6b8c81d119c08df19
parent b508ccd83e76de16e9d19e8cb010b41a1651556a
parent 2738639bcd30b908d825725169b7497ed047debb

Merge "ART: Fix CFI annotation for art_quick_aput_obj"

runtime/zip_archive.cc

diff --git a/runtime/zip_archive.cc b/runtime/zip_archive.cc
index 88c1f69..9daaf8e 100644
--- a/runtime/zip_archive.cc
+++ b/runtime/zip_archive.cc
@@ -124,7 +124,7 @@
 
   // 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_, ZipEntryName(name), zip_entry.get());
+  const int32_t error = FindEntry(handle_, ZipString(name), zip_entry.get());
   if (error) {
     *error_msg = std::string(ErrorCodeString(error));
     return nullptr;