diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index 95f92ef..abf8f72 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -20,7 +20,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_tangorpro -service insmod_sh_tangorpro /vendor/bin/insmod.sh /vendor/etc/init.insmod.tangorpro.cfg +service insmod_sh_tangorpro /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.tangorpro.cfg class main user root group root system diff --git a/device-tangorpro.mk b/device-tangorpro.mk index d0252ad..ee6af6c 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -87,9 +87,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/tangorpro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.tangorpro.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.tangorpro.cfg + device/google/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.tangorpro.cfg +endif # Camera PRODUCT_COPY_FILES += \