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

Commit 44f4f8a4 authored by Kenny Root's avatar Kenny Root Committed by Gerrit Code Review
Browse files

Merge "Remove HAVE_SELINUX guards"

parents 51ccef27 b83c0981

fastboot/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -57,9 +57,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libz



ifneq ($(HOST_OS),windows)

ifeq ($(HAVE_SELINUX), true)

LOCAL_STATIC_LIBRARIES += libselinux

endif # HAVE_SELINUX

endif # HOST_OS != windows



include $(BUILD_HOST_EXECUTABLE)

toolbox/Android.mk

+6 −17
Original line number Diff line number Diff line
@@ -56,11 +56,7 @@ TOOLS := \ 
	ionice \

	touch \

	lsof \

	md5



ifeq ($(HAVE_SELINUX),true)



TOOLS += \

	md5 \

	getenforce \

	setenforce \

	chcon \
@@ -70,9 +66,6 @@ TOOLS += \ 
	setsebool \

	load_policy



endif





ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

TOOLS += r

endif
@@ -82,17 +75,13 @@ LOCAL_SRC_FILES:= \ 
	toolbox.c \

	$(patsubst %,%.c,$(TOOLS))



LOCAL_SHARED_LIBRARIES := libcutils libc libusbhost



LOCAL_C_INCLUDES := bionic/libc/bionic



ifeq ($(HAVE_SELINUX),true)



LOCAL_CFLAGS += -DHAVE_SELINUX

LOCAL_SHARED_LIBRARIES += libselinux

LOCAL_C_INCLUDES += external/libselinux/include



endif

LOCAL_SHARED_LIBRARIES := \

	libcutils \

	libc \

	libusbhost \

	libselinux



LOCAL_MODULE:= toolbox

toolbox/id.c

+0 −7
Original line number Diff line number Diff line
@@ -4,10 +4,7 @@ 
#include <sys/types.h>

#include <pwd.h>

#include <grp.h>



#ifdef HAVE_SELINUX

#include <selinux/selinux.h>

#endif



static void print_uid(uid_t uid)

{
@@ -34,9 +31,7 @@ int id_main(int argc, char **argv) 
{

    gid_t list[64];

    int n, max;

#ifdef HAVE_SELINUX

    char *secctx;

#endif



    max = getgroups(64, list);

    if (max < 0) max = 0;
@@ -53,12 +48,10 @@ int id_main(int argc, char **argv) 
            print_gid(list[n]);

        }

    }

#ifdef HAVE_SELINUX

    if (getcon(&secctx) == 0) {

        printf(" context=%s", secctx);

        free(secctx);

    }

#endif

    printf("\n");

    return 0;

}

toolbox/ls.c

+0 −6
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ 
#include <dirent.h>

#include <errno.h>



#ifdef HAVE_SELINUX

#include <selinux/selinux.h>

#endif



#include <sys/stat.h>

#include <unistd.h>
@@ -260,11 +258,7 @@ static int listfile_maclabel(const char *path, int flags) 
        return -1;

    }



#ifdef HAVE_SELINUX

    lgetfilecon(path, &maclabel);

#else

    maclabel = strdup("-");

#endif

    if (!maclabel) {

        return -1;

    }