commit d39eeb44f13581190ba1c6f3e164797420dc0195
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 21 07:02:36 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 21 07:02:36 2018 +0000
tree 324607690497e1da8bfac754dcb3b97ba96ffd8b
parent 550a3b6dd91c49f8a13c8ade1f22d4df168f62b2
parent 99671253327edacd3ab9e3414d8e5278dfd334ce

Merge "Includes odm SELinux contexts files for recovery"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 47d7c13..9f164d8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1202,6 +1202,12 @@
     $(TARGET_RECOVERY_ROOT_OUT)/plat_property_contexts \
     $(TARGET_RECOVERY_ROOT_OUT)/vendor_property_contexts
 
+ifdef BOARD_ODM_SEPOLICY_DIRS
+recovery_sepolicy += \
+    $(TARGET_RECOVERY_ROOT_OUT)/odm_file_contexts \
+    $(TARGET_RECOVERY_ROOT_OUT)/odm_property_contexts
+endif
+
 # 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))