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

Commit 92ca0197 authored by Kenny Root's avatar Kenny Root
Browse files

Remove HAVE_SELINUX guards, part 2 

Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
parent 2244cd32

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ $(if $(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "cache_fs_type=$(BOARD_CA 
$(if $(BOARD_CACHEIMAGE_PARTITION_SIZE),$(hide) echo "cache_size=$(BOARD_CACHEIMAGE_PARTITION_SIZE)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))

$(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1))

$(if $(filter true, $(strip $(HAVE_SELINUX))), echo "selinux_fc=$(TARGET_ROOT_OUT)/file_contexts" >> $(1))

$(hide) echo "selinux_fc=$(TARGET_ROOT_OUT)/file_contexts" >> $(1)

endef



# -----------------------------------------------------------------

core/main.mk

+0 −5
Original line number Diff line number Diff line
@@ -270,11 +270,6 @@ ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),) 
is_sdk_build := true

endif



## have selinux ##

ifeq ($(HAVE_SELINUX),true)

ADDITIONAL_BUILD_PROPERTIES += ro.build.selinux=1

endif # HAVE_SELINUX



## user/userdebug ##



user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))