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

This commit is contained in:
Treehugger Robot 2018-02-03 10:00:53 +00:00 committed by Gerrit Code Review
commit 8a6ab0f240
1 changed files with 2 additions and 3 deletions

View File

@ -1191,10 +1191,9 @@ 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)/vendor_file_contexts \ $(TARGET_RECOVERY_ROOT_OUT)/nonplat_file_contexts \
$(TARGET_RECOVERY_ROOT_OUT)/plat_property_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 # 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))