Snap for 12477291 from 84a6b3d738 to 25Q1-release

Change-Id: I4a8836dde8e9af4212dc39a665340d09d7c7753b
This commit is contained in:
Android Build Coastguard Worker 2024-10-09 21:03:37 +00:00
commit 489d533485
2 changed files with 7 additions and 3 deletions

View file

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

View file

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