Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 94ea878ae0

am: 079a9f64ac

Change-Id: I11ee739b2990f166daaa6370874a29308f6bd60d
This commit is contained in:
Bo Hu 2017-12-07 08:29:54 +00:00 committed by android-build-merger
commit 71900fc787
1 changed files with 2 additions and 3 deletions

View File

@ -1133,10 +1133,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))