felix: Pull init.insmod.*.cfg from vendor_dlkm
We've started pushing init.insmod.*.cfg into the kernel prebuilts, and installing it to /vendor_dlkm/etc, but it may not be available on all prebuilt variants (e.g., kernel 5.10). Here, we: 1. conditionally install our common init.*cfg to /vendor_dlkm (only if $(TARGET_KERNEL_DIR) doesn't have a copy) 2. point init at /vendor_dlkm/etc When we've cycled completely off of kernel 5.10, we can drop #1. Bug: 369686096 Test: build, boot Flag: EXEMPT refactor Change-Id: If8f879366645cbe9bf330d136dd7190763b2d6bc
This commit is contained in:
parent
ece926a269
commit
32a1b78620
2 changed files with 7 additions and 3 deletions
|
@ -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 += \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue