From e95c166a73a4b365e04daf4e3d9444fc2bb50a56 Mon Sep 17 00:00:00 2001 From: xizx Date: Tue, 8 Sep 2020 12:37:58 +0800 Subject: [PATCH] mmi_info: 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: I758afd9f427d0fee6201f23903465f21120ff1b2 Reviewed-on: https://gerrit.mot.com/1743520 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Jianqi Yang Submit-Approved: Jira Key --- drivers/mmi_info/Android.mk | 1 + drivers/mmi_info/Kbuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmi_info/Android.mk b/drivers/mmi_info/Android.mk index ce4169cd72db..30ac3683b7be 100644 --- a/drivers/mmi_info/Android.mk +++ b/drivers/mmi_info/Android.mk @@ -6,4 +6,5 @@ LOCAL_MODULE := mmi_info.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/mmi_annotate.ko +KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/mmi_info/Kbuild b/drivers/mmi_info/Kbuild index 4060fc955a90..4a3f1a0f3fac 100644 --- a/drivers/mmi_info/Kbuild +++ b/drivers/mmi_info/Kbuild @@ -9,4 +9,4 @@ mmi_info-objs += mmi_boot_info.o mmi_info-objs += mmi_info_main.o obj-m += mmi_info.o -KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_annotate/Module.symvers +KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_annotate/$(GKI_OBJ_MODULE_DIR)/Module.symvers