commit 9f18c64d078dd8aafa8329778c3ad677cfdbdc8d
author Tri Vo <trong@google.com> Thu Mar 07 18:32:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 07 18:32:48 2019 +0000
tree 30140f41c7e2e38d023c20c8a58b5b88599bfc0a
parent 28a11ef04030ad040ce19f14085a981e106392c8
parent 62d51b65aab0fb52fee79a4e4ea71708e8fb7f71

Merge "recovery: install product_file_contexts and product_property_contexts"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 44f01ba..8a73f4e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1556,13 +1556,11 @@
     $(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \
     $(TARGET_RECOVERY_ROOT_OUT)/vendor_file_contexts \
     $(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)/vendor_property_contexts \
     $(TARGET_RECOVERY_ROOT_OUT)/odm_file_contexts \
-    $(TARGET_RECOVERY_ROOT_OUT)/odm_property_contexts
-endif
+    $(TARGET_RECOVERY_ROOT_OUT)/odm_property_contexts \
+    $(TARGET_RECOVERY_ROOT_OUT)/product_file_contexts \
+    $(TARGET_RECOVERY_ROOT_OUT)/product_property_contexts
 
 # Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific
 # SELinux files