summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-05 07:23:15 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-05 07:23:15 +0000
commit2c6694b3eca8838b25c1827431964b074c981f57 (patch)
tree77e2bd4c832f7b05a1c9725b8012d49d4132617e
parent53ca080cfb220440b2687ff9d9ce14b3c4e6a9ea (diff)
parent85d4fe9ca8a6535168647d1a6524a4cd144efb69 (diff)
downloadmuskie-2c6694b3eca8838b25c1827431964b074c981f57.tar.gz
Snap for 4378450 from 85d4fe9ca8a6535168647d1a6524a4cd144efb69 to oc-mr1-release
Change-Id: I2cebb0f93069837fc4e565e9c6128595f26d4b03
-rw-r--r--device-common.mk11
1 files changed, 2 insertions, 9 deletions
diff --git a/device-common.mk b/device-common.mk
index 6d8b6de..29df59a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -76,21 +76,14 @@ PRODUCT_COPY_FILES += \
include device/google/wahoo/device.mk
# Kernel modules
-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)))
+ifeq (,$(filter-out 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 ifeq (,$(filter-out muskie_kasan walleye_kasan, $(TARGET_PRODUCT)))
+else ifeq (,$(filter-out walleye_kasan, $(TARGET_PRODUCT)))
# if TARGET_PRODUCT == *_kasan
BOARD_VENDOR_KERNEL_MODULES += \
device/google/wahoo-kernel/kasan/synaptics_dsx_core_htc.ko \