From ec7dbbb537807157785f69580f9c3531c6bbd694 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Fri, 2 Feb 2018 07:58:45 +0800 Subject: [PATCH] Revert "Renames sepolicy files from nonplat_* to vendor_*" This reverts commit 8b5f51403814c0b095c6868e34303679f9d2cdd3. Fix angler/bullhead boot failure. Bug: 72787689 Test: build --- core/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index c9e64f8ce..1aacdc66b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1191,10 +1191,9 @@ recovery_initrc := $(call include-path-for, recovery)/etc/init.rc recovery_sepolicy := \ $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \ $(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \ - $(TARGET_RECOVERY_ROOT_OUT)/vendor_file_contexts \ + $(TARGET_RECOVERY_ROOT_OUT)/nonplat_file_contexts \ $(TARGET_RECOVERY_ROOT_OUT)/plat_property_contexts \ - $(TARGET_RECOVERY_ROOT_OUT)/vendor_property_contexts - + $(TARGET_RECOVERY_ROOT_OUT)/nonplat_property_contexts # Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific # SELinux files IGNORE_RECOVERY_SEPOLICY := $(patsubst $(TARGET_RECOVERY_OUT)/%,--exclude=/%,$(recovery_sepolicy))