From b24a32b3c6f54fe1ba577e6d7ce4779559636131 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Thu, 18 May 2017 14:37:29 -0700 Subject: [PATCH] muskie: include correct kernel modules Based on whether the lunch target is set to muskie, muskie_clang, or muskie_gcc. Bug: 32455818 Change-Id: I8bfdeb44d00f6dbe674c19206ef6ba181c4dbf4e --- device-common.mk | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/device-common.mk b/device-common.mk index 4f36395..73db23b 100644 --- a/device-common.mk +++ b/device-common.mk @@ -50,18 +50,26 @@ PRODUCT_COPY_FILES += \ include device/google/wahoo/device.mk # Kernel modules -ifeq (,$(filter muskie_clang walleye_clang, $(TARGET_PRODUCT))) -BOARD_VENDOR_KERNEL_MODULES += \ - device/google/wahoo-kernel/synaptics_dsx_core_htc.ko \ - device/google/wahoo-kernel/synaptics_dsx_rmi_dev_htc.ko \ - device/google/wahoo-kernel/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/htc_battery.ko -else +ifeq (,$(filter-out muskie_clang walleye_clang, $(TARGET_PRODUCT))) +# if TARGET_PRODUCT == *_clang BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/clang/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/clang/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/clang/synaptics_dsx_fw_update_htc.ko \ device/google/wahoo-kernel/clang/htc_battery.ko +else ifeq (,$(filter-out muskie_gcc walleye_gcc, $(TARGET_PRODUCT))) +# if TARGET_PRODUCT == *_gcc +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/gcc/synaptics_dsx_core_htc.ko \ + device/google/wahoo-kernel/gcc/synaptics_dsx_rmi_dev_htc.ko \ + device/google/wahoo-kernel/gcc/synaptics_dsx_fw_update_htc.ko \ + device/google/wahoo-kernel/gcc/htc_battery.ko +else +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/synaptics_dsx_core_htc.ko \ + device/google/wahoo-kernel/synaptics_dsx_rmi_dev_htc.ko \ + device/google/wahoo-kernel/synaptics_dsx_fw_update_htc.ko \ + device/google/wahoo-kernel/htc_battery.ko endif PRODUCT_COPY_FILES += \