From d9b9cd7244ba0d4819a17a96d0bac020d9230d59 Mon Sep 17 00:00:00 2001 From: liugy11 Date: Wed, 5 Aug 2020 15:34:20 +0800 Subject: [PATCH] Sx933x:use ANDROID_BUILD_TOP in Kbuild fix the compile error during GKI kernel 5.4 can not find base.h Change-Id: I4b01d7dd958b67c0e291d7e36eeedaedc7f19c7b Signed-off-by: liugy11 Reviewed-on: https://gerrit.mot.com/1714836 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jiacheng Ou Reviewed-by: Jianqiu Huang Reviewed-by: Tao Sun Submit-Approved: Jira Key --- drivers/misc/sx933x/Kbuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/misc/sx933x/Kbuild b/drivers/misc/sx933x/Kbuild index ee5847cdedb2..9503a7a401bb 100644 --- a/drivers/misc/sx933x/Kbuild +++ b/drivers/misc/sx933x/Kbuild @@ -1,10 +1,10 @@ -KERNEL_DIR_PATH = $(shell find $(TOP)/kernel/ -name "msm-*" | head -1 | grep -i "kernel/msm-*") +KERNEL_DIR_PATH = $(shell find $(ANDROID_BUILD_TOP)/kernel/ -name "msm-*" -type d | head -1 | grep -i "kernel/msm-*") KERNEL_VERSION_NAME = $(shell basename $(KERNEL_DIR_PATH)) # 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_SX933X_USB_CAL)),) EXTRA_CFLAGS += -DCONFIG_CAPSENSE_USB_CAL @@ -58,9 +58,9 @@ EXTRA_CFLAGS += -DCONFIG_CAPSENSE_USB_CAL endif ifneq (,$(KERNEL_DIR_PATH)) - EXTRA_CFLAGS += -I$(TOP)/kernel/$(KERNEL_VERSION_NAME)/drivers/base + EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/kernel/$(KERNEL_VERSION_NAME)/drivers/base else - EXTRA_CFLAGS += -I$(TOP)/kernel/drivers/base + EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/kernel/drivers/base endif KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../sensors/Module.symvers