diff --git a/conf/init.blueport.rc b/conf/init.blueport.rc index 5f411f8..0cf933a 100644 --- a/conf/init.blueport.rc +++ b/conf/init.blueport.rc @@ -17,7 +17,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_blueport -service insmod_sh_blueport /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_blueport /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/device-bluejay.mk b/device-bluejay.mk index 7c70b6e..7c64874 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -63,9 +63,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.bluejay.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/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.bluejay.cfg + device/google/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.bluejay.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \