From c55f0b7ef44453da577d78fbc4ec595cf99b6384 Mon Sep 17 00:00:00 2001 From: xizx Date: Tue, 8 Sep 2020 12:17:38 +0800 Subject: [PATCH] touchscreen_mmi: import correct Modules.symvers in GKI build mode When importing the Modules.symvers in fix path, the GKI module will import an incorrect one and cause module load fail in boot-gki kernel mode. Change-Id: Ie17e494821dafcc1fad147202dae445b9250875b Reviewed-on: https://gerrit.mot.com/1743517 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 75fd2c76f16f..6149df50fce1 100644 --- a/drivers/input/touchscreen/touchscreen_mmi/Android.mk +++ b/drivers/input/touchscreen/touchscreen_mmi/Android.mk @@ -26,4 +26,5 @@ LOCAL_MODULE := touchscreen_mmi.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/sensors_class.ko +KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/input/touchscreen/touchscreen_mmi/Kbuild b/drivers/input/touchscreen/touchscreen_mmi/Kbuild index 5baadfe49893..c3d23baf4da6 100644 --- a/drivers/input/touchscreen/touchscreen_mmi/Kbuild +++ b/drivers/input/touchscreen/touchscreen_mmi/Kbuild @@ -24,4 +24,4 @@ endif obj-m := touchscreen_mmi.o touchscreen_mmi-objs := touchscreen_mmi_class.o touchscreen_mmi_panel.o touchscreen_mmi_notif.o touchscreen_mmi_gesture.o -KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../sensors/Module.symvers +KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../sensors/$(GKI_OBJ_MODULE_DIR)/Module.symvers