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
+