Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 351cd2e4 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "servicemanager-recovery" 

* changes:
  Add servicemanager.recovery to base_vendor.mk.
  Add recovery service_contexts.
parents dacbe7a5 ae48bc04

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -1909,14 +1909,18 @@ $(INSTALLED_FILES_FILE_RECOVERY): $(INTERNAL_RECOVERYIMAGE_FILES) $(FILESLIST) $ 
recovery_sepolicy := \

    $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \

    $(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/plat_service_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/plat_property_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/system_ext_file_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/system_ext_service_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/system_ext_property_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/vendor_file_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/vendor_service_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/vendor_property_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/odm_file_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/odm_property_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/product_file_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/product_service_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/product_property_contexts



# Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific

target/product/base_vendor.mk

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ PRODUCT_PACKAGES += \ 
    linker.recovery \

    otacerts.recovery \

    recovery \

    servicemanager.recovery \

    shell_and_utilities_recovery \

    watchdogd.recovery \