commit 94ea878ae08cf23512a1ecdb169b8c3c6430281b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 07 04:02:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 07 04:02:29 2017 +0000
tree 7aef9d742352d7801b9f5a665b52be19460c26ea
parent fedcf41cc3dc7a3bd94322bff18d15fe3030a8c1
parent 9eb4d74e26d7c05ed2fdd4bf7fa5a4a86e70e012

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 135422d..5b0cb2c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1133,10 +1133,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))