commit ac0ea731eddb26eeec3ffdbb535c392c91a25eef
author Elliott Hughes <enh@google.com> Fri May 24 16:57:46 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 24 16:57:46 2019 -0700
tree 70a53bacef609d2fad3ced7d1ce7024869229f9d
parent 060db2e4049d6cbcdd3ddbb9fb9cd21079462820
parent de9b9501e104153f0450b0fcef7ea539a5613d0f

Merge "Track libziparchive API change." am: 3dd44d1973 am: 32112f0565
am: de9b9501e1

Change-Id: I2b1be2f116c7830ad2ba49096636876f6620dc61

vulkan/libvulkan/layers_extensions.cpp

diff --git a/vulkan/libvulkan/layers_extensions.cpp b/vulkan/libvulkan/layers_extensions.cpp
index 1239742..5679412 100644
--- a/vulkan/libvulkan/layers_extensions.cpp
+++ b/vulkan/libvulkan/layers_extensions.cpp
@@ -398,11 +398,9 @@
     ALOGD("searching for layers in '%s!/%s'", zipname.c_str(),
           dir_in_zip.c_str());
     ZipEntry entry;
-    ZipString name;
+    std::string name;
     while (Next(iter_cookie, &entry, &name) == 0) {
-        std::string filename(
-            reinterpret_cast<const char*>(name.name) + prefix.length(),
-            name.name_length - prefix.length());
+        std::string filename(name.substr(prefix.length()));
         // only enumerate direct entries of the directory, not subdirectories
         if (filename.find('/') != filename.npos)
             continue;