commit e242d8743009c8b5f9cdb0249e5cc59da50d28f8
author Elliott Hughes <enh@google.com> Thu Jun 13 13:26:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 13:26:27 2019 -0700
tree 8bfd55be3a2888e112aae51c79c603385ac5d148
parent 7d453edf342c3ea82a6a0d47c7ea215318b7bd43
parent a3211f0ecb0af220d4f448b637de67f8b9fac9d0

Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7
am: a3211f0ecb

Change-Id: Idfd053e738ab840c4bbdee3b469cbaaa94143c2f

install/install.cpp

diff --git a/install/install.cpp b/install/install.cpp
index 8d46641..445f3ab 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -539,7 +539,7 @@
 
   std::vector<std::string> compatibility_info;
   ZipEntry info_entry;
-  std::string info_name;
+  std::string_view info_name;
   while (Next(cookie, &info_entry, &info_name) == 0) {
     std::string content(info_entry.uncompressed_length, '\0');
     int32_t ret = ExtractToMemory(zip_handle, &info_entry, reinterpret_cast<uint8_t*>(&content[0]),

install/verifier.cpp

diff --git a/install/verifier.cpp b/install/verifier.cpp
index 02759cd..ab75044 100644
--- a/install/verifier.cpp
+++ b/install/verifier.cpp
@@ -320,7 +320,7 @@
 
   std::vector<Certificate> result;
 
-  std::string name;
+  std::string_view name;
   ZipEntry entry;
   while ((iter_status = Next(cookie, &entry, &name)) == 0) {
     std::vector<uint8_t> pem_content(entry.uncompressed_length);