From ff5370caae431c343d4c70c69e8b398a1ebd9e5f Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Thu, 18 May 2017 14:44:33 -0700
Subject: [PATCH] taimen: include correct kernel modules

Based on whether the lunch target is set to taimen, taimen_clang, or
taimen_gcc.

Bug: 32455818
Change-Id: I0299aa01649ca3fa5ebf050364da7f15a7b240da
---
 BoardConfig.mk | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3c1b2d5..f32e2b3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,16 +24,23 @@ 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
+ifeq (,$(filter-out taimen_clang, $(TARGET_PRODUCT)))
+# if TARGET_PRODUCT == taimen_clang
 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
+else ifeq (,$(filter-out taimen_gcc, $(TARGET_PRODUCT)))
+BOARD_VENDOR_KERNEL_MODULES += \
+# if TARGET_PRODUCT == taimen_gcc
+    device/google/wahoo-kernel/gcc/touch_core_base.ko \
+    device/google/wahoo-kernel/gcc/ftm4.ko \
+    device/google/wahoo-kernel/gcc/sw49408.ko
+else
+BOARD_VENDOR_KERNEL_MODULES += \
+    device/google/wahoo-kernel/touch_core_base.ko \
+    device/google/wahoo-kernel/ftm4.ko \
+    device/google/wahoo-kernel/sw49408.ko
 endif
 
 -include vendor/google_devices/taimen/proprietary/BoardConfigVendor.mk