Snap for 12477291 from 22dd220a6c to 25Q1-release

Change-Id: I38ea523751287e0f1032480837c16a53337d0ea6
This commit is contained in:
Android Build Coastguard Worker 2024-10-09 21:02:57 +00:00
commit 48a0d8e59d
2 changed files with 7 additions and 3 deletions

View file

@ -16,7 +16,7 @@ on early-boot
wait_for_prop vendor.common.modules.ready 1 wait_for_prop vendor.common.modules.ready 1
start insmod_sh_lynx start insmod_sh_lynx
service insmod_sh_lynx /vendor/bin/insmod.sh /vendor/etc/init.insmod.lynx.cfg service insmod_sh_lynx /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.lynx.cfg
class main class main
user root user root
group root system group root system

View file

@ -46,9 +46,13 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/lynx/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.lynx.rc device/google/lynx/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.lynx.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 += \ PRODUCT_COPY_FILES += \
device/google/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.lynx.cfg device/google/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.lynx.cfg
endif
# Camera # Camera
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \