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

Commit 40cde7bc 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: Ie7853727102725a75a7d6fa3b3b35b1ffaacd89a
parent d78168bd

fs_mgr/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



ifeq ($(HAVE_SELINUX),true)

LOCAL_CFLAGS += -DHAVE_SELINUX

endif



LOCAL_SRC_FILES:= fs_mgr.c



LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

fs_mgr/fs_mgr.c

+2 −8
Original line number Diff line number Diff line
@@ -192,14 +192,8 @@ static int parse_flags(char *flags, struct flag_list *fl, 
                /* It's not a known flag, so it must be a filesystem specific

                 * option.  Add it to fs_options if it was passed in.

                 */

#ifndef HAVE_SELINUX

                /* Drop context option from non-selinux builds */

                if (strncmp(p,"context=",8))

#endif

                {

                strlcat(fs_options, p, fs_options_len);

                strlcat(fs_options, ",", fs_options_len);

                }

            } else {

                /* fs_options was not passed in, so if the flag is unknown

                 * it's an error.