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

Commit 15a00bfe authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 33ef4ee7: resolved conflicts for merge of 4de60b26 to jb-dev-plus-aosp 

* commit '33ef4ee7':
  Make lib dir before changing ownership of app dir
parents fce51d58 33ef4ee7

cmds/installd/commands.c

+16 −13
Original line number Diff line number Diff line
@@ -57,19 +57,6 @@ int install(const char *pkgname, uid_t uid, gid_t gid) 
        unlink(pkgdir);

        return -errno;

    }

    if (chown(pkgdir, uid, gid) < 0) {

        ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(pkgdir);

        return -errno;

    }



#ifdef HAVE_SELINUX

    if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) {

        LOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(pkgdir);

        return -errno;

    }

#endif



    if (mkdir(libdir, 0755) < 0) {

        ALOGE("cannot create dir '%s': %s\n", libdir, strerror(errno));
@@ -98,6 +85,22 @@ int install(const char *pkgname, uid_t uid, gid_t gid) 
    }

#endif



    if (chown(pkgdir, uid, gid) < 0) {

        ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libdir);

        unlink(pkgdir);

        return -errno;

    }



#ifdef HAVE_SELINUX

    if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) {

        LOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libdir);

        unlink(pkgdir);

        return -errno;

    }

#endif



    return 0;

}