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

Commit 83d1c2ed authored by Yifan Hong's avatar Yifan Hong
Browse files

Install init_rc for recovery modules correctly. 

If a module is installed to TARGET_RECOVERY_ROOT_OUT,
then its init rc file (declared in LOCAL_INIT_RC) is installed
to $OUT/recovery/root/system/etc/init instead of
$TARGET(partition)_OUT_ETC/init.

Fixes: 178859897
Test: m snapuserd.recovery

Change-Id: I82d0f40d6d7047e271612204391c5a027f84f52f
parent d04a95a9

core/base_rules.mk

+6 −1
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ my_path_comp := 
###########################################################



my_init_rc_installed :=

my_init_rc_path :=

my_init_rc_pairs :=

my_installed_symlinks :=

my_default_test_module :=
@@ -534,7 +535,11 @@ ifndef LOCAL_IS_HOST_MODULE 
# Rule to install the module's companion init.rc.

my_init_rc := $(LOCAL_INIT_RC_$(my_32_64_bit_suffix)) $(LOCAL_INIT_RC)

ifneq ($(strip $(my_init_rc)),)

my_init_rc_pairs := $(foreach rc,$(my_init_rc),$(LOCAL_PATH)/$(rc):$(TARGET_OUT$(partition_tag)_ETC)/init/$(notdir $(rc)))

# Make doesn't support recovery as an output partition, but some Soong modules installed in recovery

# have init.rc files that need to be installed alongside them. Manually handle the case where the

# output file is in the recovery partition.

my_init_rc_path := $(if $(filter $(TARGET_RECOVERY_ROOT_OUT)/%,$(my_module_path)),$(TARGET_RECOVERY_ROOT_OUT)/system/etc,$(TARGET_OUT$(partition_tag)_ETC))

my_init_rc_pairs := $(foreach rc,$(my_init_rc),$(LOCAL_PATH)/$(rc):$(my_init_rc_path)/init/$(notdir $(rc)))

my_init_rc_installed := $(foreach rc,$(my_init_rc_pairs),$(call word-colon,2,$(rc)))



# Make sure we only set up the copy rules once, even if another arch variant