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

Commit 2e0d1af7 authored by Kenny Root's avatar Kenny Root Committed by Gerrit Code Review
Browse files

Merge changes I58d43128,Ie34c958f 

* changes:
  Remove HAVE_SELINUX guards, part 2
  Remove HAVE_SELINUX guard
parents 4bf886ad 92ca0197

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))

target/product/core.mk

+8 −10
Original line number Diff line number Diff line
@@ -127,6 +127,14 @@ PRODUCT_PACKAGES += \ 
    zoneinfo.idx \

    zoneinfo.version



# SELinux packages

PRODUCT_PACKAGES += \

    sepolicy \

    file_contexts \

    seapp_contexts \

    property_contexts \

    mac_permissions.xml



PRODUCT_COPY_FILES += \

    system/core/rootdir/init.usb.rc:root/init.usb.rc \

    system/core/rootdir/init.trace.rc:root/init.trace.rc \
@@ -150,14 +158,4 @@ ifeq ($(WITH_HOST_DALVIK),true) 
        zoneinfo-host.version

endif



ifeq ($(HAVE_SELINUX),true)

    PRODUCT_PACKAGES += \

        sepolicy \

        file_contexts \

        seapp_contexts \

        property_contexts \

        mac_permissions.xml

endif



$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)