Snap for 12477291 from f8abd0df8b to 25Q1-release

Change-Id: Id2e5c59f2f363d6a3c68fa8dfc2042a10bff1084
This commit is contained in:
Android Build Coastguard Worker 2024-10-09 21:01:56 +00:00
commit 39b5b48aa7
2 changed files with 7 additions and 3 deletions

View file

@ -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

View file

@ -62,9 +62,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 += \