Merge 03a6d6486e
on remote branch
Change-Id: Iff93f1314c4c0f7152fd9406c8c7c7b09bc0c0f2
This commit is contained in:
24
Android.mk
24
Android.mk
@@ -215,6 +215,30 @@ else ifeq ($(TARGET_BOARD_PLATFORM), crow)
|
||||
include $(DLKM_DIR)/Build_external_kernelmodule.mk
|
||||
###########################################################
|
||||
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), bengal)
|
||||
|
||||
###########################################################
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
|
||||
LOCAL_MODULE := synaptics_tcm_ts.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := synaptics_tcm_ts.ko
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
#LOCAL_MODULE_DEBUG_ENABLE := true
|
||||
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
||||
include $(DLKM_DIR)/Build_external_kernelmodule.mk
|
||||
###########################################################
|
||||
|
||||
###########################################################
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
|
||||
LOCAL_MODULE := nt36xxx-i2c.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := nt36xxx-i2c.ko
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
#LOCAL_MODULE_DEBUG_ENABLE := true
|
||||
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
||||
include $(DLKM_DIR)/Build_external_kernelmodule.mk
|
||||
###########################################################
|
||||
|
||||
else
|
||||
|
||||
###########################################################
|
||||
|
@@ -2,4 +2,5 @@ export CONFIG_TOUCHSCREEN_SYNAPTICS_TCM=y
|
||||
export CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C=y
|
||||
export CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_CORE=y
|
||||
export CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_TOUCH=y
|
||||
export CONFIG_TOUCHSCREEN_NT36XXX_I2C=y
|
||||
export CONFIG_MSM_TOUCH=m
|
||||
|
@@ -7,4 +7,5 @@
|
||||
#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C 1
|
||||
#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_CORE 1
|
||||
#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_TOUCH 1
|
||||
#define CONFIG_TOUCHSCREEN_NT36XXX_I2C 1
|
||||
|
||||
|
@@ -29,6 +29,9 @@ ifeq ($(TOUCH_DLKM_ENABLE), true)
|
||||
$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), crow)
|
||||
BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), bengal)
|
||||
BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
|
||||
$(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko
|
||||
else
|
||||
BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
|
||||
$(KERNEL_MODULES_OUT)/goodix_ts.ko \
|
||||
|
@@ -27,6 +27,9 @@ ifeq ($(TOUCH_DLKM_ENABLE), true)
|
||||
$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), crow)
|
||||
PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), bengal)
|
||||
PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
|
||||
$(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko
|
||||
else
|
||||
PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
|
||||
$(KERNEL_MODULES_OUT)/goodix_ts.ko \
|
||||
|
Reference in New Issue
Block a user