Merge "Renames sepolicy files from nonplat_* to vendor_*"

am: 8b35ac67b2

Change-Id: Ib517d7fa5843efab43bac8fd66a2db35efaa58da
This commit is contained in:
Bowgo Tsai
2018-02-05 17:43:47 +00:00
committed by android-build-merger

View File

@@ -1191,9 +1191,10 @@ recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
recovery_sepolicy := \ recovery_sepolicy := \
$(TARGET_RECOVERY_ROOT_OUT)/sepolicy \ $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \
$(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \ $(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \
$(TARGET_RECOVERY_ROOT_OUT)/nonplat_file_contexts \ $(TARGET_RECOVERY_ROOT_OUT)/vendor_file_contexts \
$(TARGET_RECOVERY_ROOT_OUT)/plat_property_contexts \ $(TARGET_RECOVERY_ROOT_OUT)/plat_property_contexts \
$(TARGET_RECOVERY_ROOT_OUT)/nonplat_property_contexts $(TARGET_RECOVERY_ROOT_OUT)/vendor_property_contexts
# Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific # Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific
# SELinux files # SELinux files
IGNORE_RECOVERY_SEPOLICY := $(patsubst $(TARGET_RECOVERY_OUT)/%,--exclude=/%,$(recovery_sepolicy)) IGNORE_RECOVERY_SEPOLICY := $(patsubst $(TARGET_RECOVERY_OUT)/%,--exclude=/%,$(recovery_sepolicy))