commit de9b9501e104153f0450b0fcef7ea539a5613d0f
author Elliott Hughes <enh@google.com> Fri May 24 13:24:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 24 13:24:18 2019 -0700
tree 868771fa32d7209507f1f2729215cb2b2e4ab737
parent 8231d8d4523794d6df3a574f6652d5f1060eba40
parent 32112f05658dfdb8b0c0e75a6b89605a42e4e92d

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

Change-Id: I51b605f0011926b5063a26a1541fd3bf87dccfb4

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;