From accd702702c3e579f195766ae2ea7f0bc857524e Mon Sep 17 00:00:00 2001 From: xuwt2 Date: Tue, 16 Nov 2021 20:33:14 +0800 Subject: [PATCH] qpnp_adaptive: Change Makefile to compatible with Android S build Change the build make file to be compatible with Android S build. Change-Id: I9faf66a92f1d4c4bb32b6069d9ed4b9e08f66392 Signed-off-by: xuwt2 Reviewed-on: https://gerrit.mot.com/2117635 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Yonghua Yan Reviewed-by: Jianqi Yang Submit-Approved: Jira Key --- drivers/power/qpnp_adaptive_charge/Android.mk | 5 ++++- drivers/power/qpnp_adaptive_charge/Makefile | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/power/qpnp_adaptive_charge/Android.mk b/drivers/power/qpnp_adaptive_charge/Android.mk index 61e553755a83..64d813794407 100755 --- a/drivers/power/qpnp_adaptive_charge/Android.mk +++ b/drivers/power/qpnp_adaptive_charge/Android.mk @@ -7,13 +7,16 @@ LOCAL_MODULE_TAGS := optional ifeq ($(USE_MMI_CHARGER), true) KERNEL_CFLAGS += CONFIG_USE_MMI_CHARGER=y -LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/mmi_charger.ko + KBUILD_OPTIONS += CONFIG_USE_MMI_CHARGER=y + LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/mmi_charger.ko endif ifeq ($(ADAPTIVE_TOLERANCE_OPTIMIZATION),true) KERNEL_CFLAGS += ADAPTIVE_TOLERANCE_OPTIMIZATION=y + KBUILD_OPTIONS += ADAPTIVE_TOLERANCE_OPTIMIZATION=y endif LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) +KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/power/qpnp_adaptive_charge/Makefile b/drivers/power/qpnp_adaptive_charge/Makefile index 34b09dd815a7..d588e1c83b72 100755 --- a/drivers/power/qpnp_adaptive_charge/Makefile +++ b/drivers/power/qpnp_adaptive_charge/Makefile @@ -1,10 +1,17 @@ -KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build +all: modules -all: - $(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS) +modules: + $(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS) modules_install: - $(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install + $(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(M) modules_install + +%: + $(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS) clean: - $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean \ No newline at end of file + rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers + rm -rf .tmp_versions + +KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_charger/$(GKI_OBJ_MODULE_DIR)/Module.symvers +