Merge "felix: Pull init.insmod.*.cfg from vendor_dlkm" into main

This commit is contained in:
Treehugger Robot 2024-10-08 22:15:21 +00:00 committed by Android (Google) Code Review
commit 70c67ccdb5
2 changed files with 7 additions and 3 deletions

View file

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