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

Commit 30c5d2cf 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: f2e886c2

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

Change-Id: Ie36e867080b9988c6760d11fdd5a250a91bac3ec
parents ef5cefbf f2e886c2
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);