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

Commit de9b9501 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Track libziparchive API change." am: 3dd44d19

am: 32112f05

Change-Id: I51b605f0011926b5063a26a1541fd3bf87dccfb4
parents 8231d8d4 32112f05
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -398,11 +398,9 @@ void ForEachFileInZip(const std::string& zipname,
    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;