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

Commit 4c1544c2 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Remove HAVE_SELINUX guards 

Android 4.3, and by extension CM 10.2, default to having SELinux on

Change-Id: I0f83c0b9712388216b89dfbe6184ad0a220a74d6
parent a0a9ef79

cmds/installd/commands.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -18,9 +18,7 @@ 
#include "installd.h"

#include "installd.h"

#include <diskusage/dirsize.h>

#include <diskusage/dirsize.h>





#ifdef HAVE_SELINUX

#include <selinux/android.h>

#include <selinux/android.h>

#endif





/* Directory records that are used in execution of commands. */

/* Directory records that are used in execution of commands. */

dir_rec_t android_data_dir;

dir_rec_t android_data_dir;
@@ -95,14 +93,12 @@ int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo) 
        return -1;

        return -1;

    }

    }





#ifdef HAVE_SELINUX

    if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {

    if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {

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

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

        unlink(libsymlink);

        unlink(libsymlink);

        unlink(pkgdir);

        unlink(pkgdir);

        return -1;

        return -1;

    }

    }

#endif





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

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

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

        ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));
@@ -251,14 +247,12 @@ int make_user_data(const char *pkgname, uid_t uid, uid_t persona, const char* se 
        return -1;

        return -1;

    }

    }





#ifdef HAVE_SELINUX

    if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {

    if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {

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

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

        unlink(libsymlink);

        unlink(libsymlink);

        unlink(pkgdir);

        unlink(pkgdir);

        return -errno;

        return -errno;

    }

    }

#endif





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

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

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

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