SELinux can be assumed for Android 4.4+ (87413643) · Commits · e / tools / etwrp

Android.mk

+12 −23

Original line number	Diff line number	Diff line
		@@ -159,18 +159,10 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
		#LOCAL_STATIC_LIBRARIES += liblz4
		endif
		endif
		ifneq ($(wildcard external/libselinux/Android.mk),)
		TWHAVE_SELINUX := true
		endif
		ifeq ($(TWHAVE_SELINUX), true)
		#LOCAL_C_INCLUDES += external/libselinux/include
		#LOCAL_STATIC_LIBRARIES += libselinux
		#LOCAL_CFLAGS += -DHAVE_SELINUX -g
		endif # HAVE_SELINUX
		ifeq ($(TWHAVE_SELINUX), true)

		LOCAL_C_INCLUDES += external/libselinux/include
		LOCAL_SHARED_LIBRARIES += libselinux
		LOCAL_CFLAGS += -DHAVE_SELINUX
		LOCAL_CFLAGS += -g
		ifneq ($(TARGET_USERIMAGES_USE_EXT4), true)
		LOCAL_CFLAGS += -DUSE_EXT4
		LOCAL_C_INCLUDES += system/extras/ext4_utils
		@@ -179,7 +171,6 @@ ifeq ($(TWHAVE_SELINUX), true)
		LOCAL_STATIC_LIBRARIES += liblz4
		endif
		endif
		endif

		ifeq ($(AB_OTA_UPDATER),true)
		LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
		@@ -509,11 +500,9 @@ endif

		# If busybox does not have restorecon, assume it does not have SELinux support.
		# Then, let toolbox provide 'ls' so -Z is available to list SELinux contexts.
		ifeq ($(TWHAVE_SELINUX), true)
		ifeq ($(filter restorecon, $(notdir $(BUSYBOX_LINKS))),)
		exclude += ls
		endif
		endif

		RECOVERY_BUSYBOX_TOOLS := $(filter-out $(exclude), $(notdir $(BUSYBOX_LINKS)))
		RECOVERY_BUSYBOX_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/, $(RECOVERY_BUSYBOX_TOOLS))

+4 −22

Original line number	Diff line number	Diff line
		@@ -25,16 +25,13 @@
		#include "fixContexts.hpp"
		#include "twrp-functions.hpp"
		#include "twcommon.h"
		#ifdef HAVE_SELINUX
		#include "selinux/selinux.h"
		#include "selinux/label.h"
		#include "selinux/android.h"
		#include "selinux/label.h"
		#endif
		#include <selinux/selinux.h>
		#include <selinux/label.h>
		#include <selinux/android.h>
		#include <selinux/label.h>

		using namespace std;

		#ifdef HAVE_SELINUX
		struct selabel_handle *sehandle;
		struct selinux_opt selinux_options[] = {
		{ SELABEL_OPT_PATH, "/file_contexts" }
		@@ -146,18 +143,3 @@ int fixContexts::fixDataMediaContexts(string Mount_Point) {
		selabel_close(sehandle);
		return 0;
		}

		#else

		int fixContexts::restorecon(string entry __unused, struct stat *sb __unused) {
		return -1;
		}

		int fixContexts::fixContextsRecursively(string name __unused, int level __unused) {
		return -1;
		}

		int fixContexts::fixDataMediaContexts(string Mount_Point __unused) {
		return -1;
		}
		#endif

+0 −3

Original line number	Diff line number	Diff line
		@@ -55,9 +55,6 @@ endif
		ifneq ($(TW_NO_SCREEN_TIMEOUT),)
		LOCAL_CFLAGS += -DTW_NO_SCREEN_TIMEOUT
		endif
		ifeq ($(HAVE_SELINUX), true)
		LOCAL_CFLAGS += -DHAVE_SELINUX
		endif
		ifeq ($(TW_OEM_BUILD), true)
		LOCAL_CFLAGS += -DTW_OEM_BUILD
		endif

+4 −10

Original line number	Diff line number	Diff line
		@@ -10,11 +10,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) \
		external/zlib
		LOCAL_SHARED_LIBRARIES += libz libc

		ifeq ($(TWHAVE_SELINUX), true)
		LOCAL_C_INCLUDES += external/libselinux/include
		LOCAL_SHARED_LIBRARIES += libselinux
		LOCAL_CFLAGS += -DHAVE_SELINUX
		endif

		ifeq ($(TW_INCLUDE_CRYPTO_FBE), true)
		LOCAL_SHARED_LIBRARIES += libe4crypt
		@@ -34,11 +31,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) \
		external/zlib
		LOCAL_STATIC_LIBRARIES += libz libc

		ifeq ($(TWHAVE_SELINUX), true)
		LOCAL_C_INCLUDES += external/libselinux/include
		LOCAL_STATIC_LIBRARIES += libselinux
		LOCAL_CFLAGS += -DHAVE_SELINUX
		endif

		ifeq ($(TW_INCLUDE_CRYPTO_FBE), true)
		LOCAL_SHARED_LIBRARIES += libe4crypt

+1 −5

Original line number	Diff line number	Diff line
		@@ -35,9 +35,7 @@
		# include <unistd.h>
		#endif

		#ifdef HAVE_SELINUX
		# include "selinux/selinux.h"
		#endif
		#include <selinux/selinux.h>

		#ifdef HAVE_EXT4_CRYPT
		# include "ext4crypt_tar.h"
		@@ -105,7 +103,6 @@ tar_append_file(TAR t, const char realname, const char *savename)
		#endif
		th_set_path(t, (savename ? savename : realname));

		#ifdef HAVE_SELINUX
		/* get selinux context */
		if (t->options & TAR_STORE_SELINUX)
		{
		@@ -129,7 +126,6 @@ tar_append_file(TAR t, const char realname, const char *savename)
		#endif
		}
		}
		#endif

		#ifdef HAVE_EXT4_CRYPT
		if (TH_ISDIR(t) && t->options & TAR_STORE_EXT4_POL)