Use BOARD_VENDOR_KERNEL_MODULES for modules instead of PRODUCT_COPY_FILES

Change-Id: I676cda3893393467661d5db0adb499027d24b3c9
Signed-off-by: Thierry Strudel <tstrudel@google.com>
This commit is contained in:
Thierry Strudel
2017-05-08 14:59:15 -07:00
parent a45427973e
commit 64db4b6e3e
2 changed files with 12 additions and 6 deletions

View File

@@ -26,4 +26,16 @@ include device/google/wahoo/BoardConfig.mk
BOARD_BOOTIMAGE_PARTITION_SIZE := 41943040
BOARD_AVB_ENABLE := true
ifeq (,$(filter taimen_clang, $(TARGET_PRODUCT)))
BOARD_VENDOR_KERNEL_MODULES += \
device/google/wahoo-kernel/touch_core_base.ko \
device/google/wahoo-kernel/ftm4.ko \
device/google/wahoo-kernel/sw49408.ko
else
BOARD_VENDOR_KERNEL_MODULES += \
device/google/wahoo-kernel/clang/touch_core_base.ko \
device/google/wahoo-kernel/clang/ftm4.ko \
device/google/wahoo-kernel/clang/sw49408.ko
endif
-include vendor/google_devices/taimen/proprietary/BoardConfigVendor.mk

View File

@@ -41,12 +41,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_COPY_FILES += \
device/google/taimen/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg
# Kernel modules
PRODUCT_COPY_FILES += \
device/google/wahoo-kernel/touch_core_base.ko:$(TARGET_COPY_OUT_VENDOR)/lib/modules/touch_core_base.ko \
device/google/wahoo-kernel/ftm4.ko:$(TARGET_COPY_OUT_VENDOR)/lib/modules/ftm4.ko \
device/google/wahoo-kernel/sw49408.ko:$(TARGET_COPY_OUT_VENDOR)/lib/modules/sw49408.ko
# Logging
PRODUCT_COPY_FILES += \
device/google/taimen/init.logging.rc:root/init.$(PRODUCT_HARDWARE).logging.rc