commit ec7dbbb537807157785f69580f9c3531c6bbd694
author Bowgo Tsai <bowgotsai@google.com> Fri Feb 02 07:58:45 2018 +0800
committer Bowgo Tsai <bowgotsai@google.com> Fri Feb 02 07:58:45 2018 +0800
tree 50f307503629e5a4500febac82485da645f648c4
parent a4c7d59afca1e74309ba5292cf8fe3d51773665b

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

This reverts commit 8b5f51403814c0b095c6868e34303679f9d2cdd3.
Fix angler/bullhead boot failure.

Bug: 72787689
Test: build

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index c9e64f8..1aacdc6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1191,10 +1191,9 @@
 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))