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

Commit e0420dc8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Compress .so files for PackageManager to reclaim the space""...

Merge "Revert "Compress .so files for PackageManager to reclaim the space"" am: 67610047 am: 7dafb8c4 am: a8e2d0bf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2159418



Change-Id: I5829a6b43e6145dba6885d5c11ef4975e17383c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc2f43f5 a8e2d0bf
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@
#include <inttypes.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <linux/fs.h>

#include <memory>

@@ -254,16 +253,6 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr
        return INSTALL_FAILED_CONTAINER_ERROR;
    }

    // If a filesystem like f2fs supports per-file compression, set the compression bit before data
    // writes
    unsigned int flags;
    if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1) {
        ALOGE("Failed to call FS_IOC_GETFLAGS on %s: %s\n", localTmpFileName, strerror(errno));
    } else if ((flags & FS_COMPR_FL) == 0) {
        flags |= FS_COMPR_FL;
        ioctl(fd, FS_IOC_SETFLAGS, &flags);
    }

    if (!zipFile->uncompressEntry(zipEntry, fd)) {
        ALOGE("Failed uncompressing %s to %s\n", fileName, localTmpFileName);
        close(fd);