commit 1ee67e6b19606426d67597736db1b987ae291d6b
author Jeff Vander Stoep <jeffv@google.com> Tue Jun 13 08:30:46 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 13 20:05:07 2017 +0000
tree 891eb409858340ff532bcd5fc127c4890d4913af
parent 10d2c7ca64fc98566efdae29ff36ec8d69102658

Build split file_contexts for recovery

Bug: 62564629
Test: build and flash marlin. Successfully switch between regular
    and recovery modes

Change-Id: I67ae2f59ca1868cfe777de0d4f0c4e3c2d99329d
(cherry picked from commit 4ff042c4aa0309a44fba9bb7edeb86d301191bfc)

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 961f35d..958e9f7 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1021,7 +1021,8 @@
 recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
 recovery_sepolicy := \
     $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \
-    $(TARGET_RECOVERY_ROOT_OUT)/file_contexts.bin \
+    $(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \
+    $(TARGET_RECOVERY_ROOT_OUT)/nonplat_file_contexts \
     $(TARGET_RECOVERY_ROOT_OUT)/plat_property_contexts \
     $(TARGET_RECOVERY_ROOT_OUT)/nonplat_property_contexts
 # Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific