commit f1a138b2962acf7c9ed0d222740135cd51c850fa
author Bowgo Tsai <bowgotsai@google.com> Thu Nov 30 22:15:17 2017 +0800
committer Bowgo Tsai <bowgotsai@google.com> Wed Mar 21 20:33:53 2018 +0800
tree 8df74372893ab9011bfbe11af102f6a5c56b9920
parent 5681de773dba15549a836b198805ada43989249a

Includes odm SELinux contexts files for recovery

Bug: 64240127
Test: normal boot and recovery boot a device
Change-Id: I475d2eef96d2091291b56410f403f14dd3292faa
Merged-In: I475d2eef96d2091291b56410f403f14dd3292faa
(cherry picked from commit 99671253327edacd3ab9e3414d8e5278dfd334ce)

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 7911026..d86c152 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1203,6 +1203,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))