From 55730686f5e922c194ce7f16cb13000fba706db7 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Wed, 23 Feb 2022 02:41:40 +0000 Subject: [PATCH] Revert "Revert "Turn on SELinux"" This reverts commit 077aaa107b9d0d9906cf138093c9735ece42261b. Reason for revert: SELinux issues are fixed Change-Id: I90f32b8b633988ab6f79606ac8464cbb07a861dd --- BoardConfig-common.mk | 1 - factory_common.mk | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index a559346c..ce8d71b1 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -36,7 +36,6 @@ BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\" BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs -BOARD_BOOTCONFIG += androidboot.selinux=permissive TARGET_NO_BOOTLOADER := true TARGET_NO_KERNEL := false diff --git a/factory_common.mk b/factory_common.mk index 8befad2c..0e2fd5c2 100644 --- a/factory_common.mk +++ b/factory_common.mk @@ -54,8 +54,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true # factory should always has SELinux permissive -#BOARD_BOOTCONFIG += androidboot.selinux=permissive -#BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive +BOARD_BOOTCONFIG += androidboot.selinux=permissive +BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive # Disable Bluetooth as default in factory build DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory