Merge "touch: enable focaltech touch compilation for volcano target"

Android.mk

@@ -330,6 +330,17 @@ else ifeq ($(TARGET_BOARD_PLATFORM), volcano)
        include $(DLKM_DIR)/Build_external_kernelmodule.mk
        ###########################################################
 
+       ###########################################################
+       include $(CLEAR_VARS)
+       LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
+       LOCAL_MODULE              := focaltech_fts.ko
+       LOCAL_MODULE_KBUILD_NAME  := focaltech_fts.ko
+       LOCAL_MODULE_TAGS         := optional
+       #LOCAL_MODULE_DEBUG_ENABLE := true
+       LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+       include $(DLKM_DIR)/Build_external_kernelmodule.mk
+       ###########################################################
+
 else
 
        ###########################################################

target.bzl

@@ -11,7 +11,8 @@ def define_pineapple(t,v):
             "nt36xxx-i2c",
             "atmel_mxt_ts",
             "dummy_ts",
-            "goodix_ts"
+            "goodix_ts",
+            "focaltech_fts"
         ],
         config_options = [
             "TOUCH_DLKM_ENABLE",
@@ -20,7 +21,8 @@ def define_pineapple(t,v):
             "CONFIG_TOUCHSCREEN_GOODIX_BRL",
             "CONFIG_TOUCHSCREEN_NT36XXX_I2C",
             "CONFIG_TOUCHSCREEN_ATMEL_MXT",
-            "CONFIG_TOUCHSCREEN_DUMMY"
+            "CONFIG_TOUCHSCREEN_DUMMY",
+            "CONFIG_TOUCH_FOCALTECH"
         ],
 )
 

touch_driver_board.mk

@@ -40,7 +40,8 @@ ifeq ($(TOUCH_DLKM_ENABLE),  true)
                                 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/focaltech_fts.ko \
                                         $(KERNEL_MODULES_OUT)/goodix_ts.ko
                         else ifeq ($(TARGET_BOARD_PLATFORM), volcano)
-                                BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
+                                BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/goodix_ts.ko \
+                                        $(KERNEL_MODULES_OUT)/focaltech_fts.ko
                         else
                                 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
                                         $(KERNEL_MODULES_OUT)/goodix_ts.ko \

touch_driver_product.mk

@@ -38,7 +38,8 @@ ifeq ($(TOUCH_DLKM_ENABLE),  true)
                 PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/focaltech_fts.ko \
                         $(KERNEL_MODULES_OUT)/goodix_ts.ko
         else ifeq ($(TARGET_BOARD_PLATFORM), volcano)
-                PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
+                PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/goodix_ts.ko \
+                        $(KERNEL_MODULES_OUT)/focaltech_fts.ko
         else
                 PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
                         $(KERNEL_MODULES_OUT)/goodix_ts.ko \