Merge "recovery: install product_file_contexts and product_property_contexts" am: 9f18c64d07 am: 6a03c1677b

am: 34f72c8e30

Change-Id: I402c8ca7817ed2beee28e7949dc8e8e8dbd10f74
This commit is contained in:
Tri Vo
2019-03-07 12:25:36 -08:00
committed by android-build-merger

View File

@@ -1560,13 +1560,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