Revert "Revert "Turn on SELinux"" am: 55730686f5

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/16984063

Change-Id: I991e740905c7c6dd7cac5295c9d07e7c640c89d0
This commit is contained in:
Michael Wright 2022-02-23 17:24:52 +00:00 committed by Automerger Merge Worker
commit 0d7dda24aa
2 changed files with 2 additions and 3 deletions

View file

@ -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 += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
BOARD_BOOTCONFIG += androidboot.selinux=permissive
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true
TARGET_NO_KERNEL := false TARGET_NO_KERNEL := false

View file

@ -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 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true
# factory should always has SELinux permissive # factory should always has SELinux permissive
#BOARD_BOOTCONFIG += androidboot.selinux=permissive BOARD_BOOTCONFIG += androidboot.selinux=permissive
#BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
# Disable Bluetooth as default in factory build # Disable Bluetooth as default in factory build
DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory