From 276b8c023037e96f3add6db1c8c66865dcf24445 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Sat, 13 Nov 2021 00:23:44 -0800 Subject: [PATCH 1/2] Add recovery service_contexts. This allows servicemanager to run in recovery. Test: manual Bug: 170338625 Change-Id: I60671af0bcaf13fd545b2f286243fee474caace5 --- core/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/Makefile b/core/Makefile index 352ab1adad..163a2050b5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1862,14 +1862,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 From ae48bc04992b1c47d014beb15f917439c71c799d Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 12 Nov 2021 19:53:40 -0800 Subject: [PATCH 2/2] Add servicemanager.recovery to base_vendor.mk. This is so that AIDL HALs can run in recovery. Test: manual in recovery Bug: 170338625 Change-Id: Ie9bb7bd554d9d848e6bacd091e2273b7f390c2a9 --- target/product/base_vendor.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 7622a69385..5004b85ee1 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -25,6 +25,7 @@ PRODUCT_PACKAGES += \ linker.recovery \ otacerts.recovery \ recovery \ + servicemanager.recovery \ shell_and_utilities_recovery \ watchdogd.recovery \