From 62d51b65aab0fb52fee79a4e4ea71708e8fb7f71 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Tue, 19 Feb 2019 11:23:12 -0800 Subject: [PATCH] recovery: install product_file_contexts and product_property_contexts Product partition is not mounted in recovery mode. Install product_file_contexts and product_property_contexts into rootdir for recovery. This is similar to how we deal with system, vendor, and odm *_contexts files. And remove unnecessary ifdefs. Test: m bootimage for pixel 3, product_file_contexts and product_property_contexts appear in $OUT/recovery/root/ Change-Id: I416d9e6ea742e67a6fe294f1ad8b78fb9b844260 --- core/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/Makefile b/core/Makefile index b3e9d37b2f..8cf038db73 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1541,13 +1541,11 @@ recovery_sepolicy := \ $(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