Loading core/base_rules.mk +12 −4 Original line number Diff line number Diff line Loading @@ -590,10 +590,18 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) my_init_rc := $(foreach rc,$(LOCAL_INIT_RC_$(my_32_64_bit_suffix)) $(LOCAL_INIT_RC),$(LOCAL_PATH)/$(rc)) endif ifneq ($(strip $(my_init_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)) # Make doesn't support recovery or ramdisk as an output partition, # but some Soong modules installed in recovery or ramdisk # have init.rc files that need to be installed alongside them. # Manually handle the case where the # output file is in the recovery or ramdisk partition. ifneq (,$(filter $(TARGET_RECOVERY_ROOT_OUT)/%,$(my_module_path))) my_init_rc_path := $(TARGET_RECOVERY_ROOT_OUT)/system/etc else ifneq (,$(filter $(TARGET_RAMDISK_OUT)/%,$(my_module_path))) my_init_rc_path := $(TARGET_RAMDISK_OUT)/system/etc else my_init_rc_path := $(TARGET_OUT$(partition_tag)_ETC) endif my_init_rc_pairs := $(foreach rc,$(my_init_rc),$(rc):$(my_init_rc_path)/init/$(notdir $(rc))) my_init_rc_installed := $(foreach rc,$(my_init_rc_pairs),$(call word-colon,2,$(rc))) Loading Loading
core/base_rules.mk +12 −4 Original line number Diff line number Diff line Loading @@ -590,10 +590,18 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) my_init_rc := $(foreach rc,$(LOCAL_INIT_RC_$(my_32_64_bit_suffix)) $(LOCAL_INIT_RC),$(LOCAL_PATH)/$(rc)) endif ifneq ($(strip $(my_init_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)) # Make doesn't support recovery or ramdisk as an output partition, # but some Soong modules installed in recovery or ramdisk # have init.rc files that need to be installed alongside them. # Manually handle the case where the # output file is in the recovery or ramdisk partition. ifneq (,$(filter $(TARGET_RECOVERY_ROOT_OUT)/%,$(my_module_path))) my_init_rc_path := $(TARGET_RECOVERY_ROOT_OUT)/system/etc else ifneq (,$(filter $(TARGET_RAMDISK_OUT)/%,$(my_module_path))) my_init_rc_path := $(TARGET_RAMDISK_OUT)/system/etc else my_init_rc_path := $(TARGET_OUT$(partition_tag)_ETC) endif my_init_rc_pairs := $(foreach rc,$(my_init_rc),$(rc):$(my_init_rc_path)/init/$(notdir $(rc))) my_init_rc_installed := $(foreach rc,$(my_init_rc_pairs),$(call word-colon,2,$(rc))) Loading