Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80bd3c75 authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK"...

Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK" into nyc-dev am: b59de7fa
am: ee1988db

* commit 'ee1988db':
  libvulkan: Don't try to load compressed/unaligned libraries from APK

Change-Id: I60cd16daa51cc3b87da86d37bc10f550f0afd337
parents ef5cefbf ee1988db
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -366,7 +366,14 @@ void ForEachFileInZip(const std::string& zipname,
            reinterpret_cast<const char*>(name.name) + prefix.length(),
            name.name_length - prefix.length());
        // only enumerate direct entries of the directory, not subdirectories
        if (filename.find('/') == filename.npos)
        if (filename.find('/') != filename.npos)
            continue;
        // Check whether it *may* be possible to load the library directly from
        // the APK. Loading still may fail for other reasons, but this at least
        // lets us avoid failed-to-load log messages in the typical case of
        // compressed and/or unaligned libraries.
        if (entry.method != kCompressStored || entry.offset % PAGE_SIZE != 0)
            continue;
        functor(filename);
    }
    EndIteration(iter_cookie);