From fbe4fb48e457c35569f4bdc4cf6edcc5629284e4 Mon Sep 17 00:00:00 2001 From: litong Date: Wed, 19 Aug 2020 11:26:42 +0800 Subject: [PATCH] Modify touchscreen class compilation errors on V(CR). 1. TOP -> ANDROID_BUILD_TOP to solve the error that the .h file cannot be found. 2. touchscreen_class depended on sensors_class module symbol, so it must define the dependency in makefile. Change-Id: Ibdc7a761b1cdce2678375719f0fe34748639f8fc Reviewed-on: https://gerrit.mot.com/1718150 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jichao Zou Submit-Approved: Jira Key --- drivers/input/touchscreen/touchscreen_mmi/Android.mk | 1 + drivers/input/touchscreen/touchscreen_mmi/Kbuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/touchscreen_mmi/Android.mk b/drivers/input/touchscreen/touchscreen_mmi/Android.mk index 1e5443b9c167..1ac92c066572 100644 --- a/drivers/input/touchscreen/touchscreen_mmi/Android.mk +++ b/drivers/input/touchscreen/touchscreen_mmi/Android.mk @@ -17,4 +17,5 @@ include $(CLEAR_VARS) LOCAL_MODULE := touchscreen_mmi.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) +LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/sensors_class.ko include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/input/touchscreen/touchscreen_mmi/Kbuild b/drivers/input/touchscreen/touchscreen_mmi/Kbuild index 8a233c0d19c2..dde5747d1535 100644 --- a/drivers/input/touchscreen/touchscreen_mmi/Kbuild +++ b/drivers/input/touchscreen/touchscreen_mmi/Kbuild @@ -1,6 +1,6 @@ # add -Wall to try to catch everything we can. EXTRA_CFLAGS += -Wall -EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include +EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include ifneq ($(filter m y, $(CONFIG_PANEL_NOTIFICATIONS)),) EXTRA_CFLAGS += -DCONFIG_PANEL_NOTIFICATIONS