diff --git a/drivers/input/misc/vl53L1/Android.mk b/drivers/input/misc/vl53L1/Android.mk
new file mode 100644
index 000000000000..970b45287012
--- /dev/null
+++ b/drivers/input/misc/vl53L1/Android.mk
@@ -0,0 +1,9 @@
+DLKM_DIR := motorola/kernel/modules
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := stmvl53l1.ko
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+include $(DLKM_DIR)/AndroidKernelModule.mk
+
diff --git a/drivers/input/misc/vl53L1/Kbuild b/drivers/input/misc/vl53L1/Kbuild
index 4a113949a51a..690f179fbbb3 100644
--- a/drivers/input/misc/vl53L1/Kbuild
+++ b/drivers/input/misc/vl53L1/Kbuild
@@ -2,19 +2,21 @@
 # Kbuild for the vl53L1 drivers.
 #
 
-ccflags-y	+= -I$(src)/inc -I$(src)/ipp -I$(src)
+EXTRA_CFLAGS += -Wall
+EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
+EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/drivers/input/misc/vl53L1/inc -I$(TOP)/motorola/kernel/modules/drivers/input/misc/vl53L1/ipp -I$(TOP)/motorola/kernel/modules/drivers/input/misc/vl53L1
 
 # define this environment variable if you want to compile driver for an old
 # kernel
 ifdef OLD_NETLINK_API
-ccflags-y	+= -DOLD_NETLINK_API
+EXTRA_CFLAGS	+= -DOLD_NETLINK_API
 endif
 
 ifdef VL53L1_LOG_ENABLE
-ccflags-y	+= -DVL53L1_LOG_ENABLE
+EXTRA_CFLAGS	+= -DVL53L1_LOG_ENABLE
 endif
 
-obj-$(CONFIG_STMVL53L1)	+= stmvl53l1.o
+obj-m	+= stmvl53l1.o
 stmvl53l1-objs		:= stmvl53l1_module.o stmvl53l1_module-i2c.o
 stmvl53l1-objs		+= stmvl53l1_i2c.o stmvl53l1_ipp_nl.o stmvl53l1_log.o
 stmvl53l1-objs		+= src/vl53l1_api.o src/vl53l1_api_core.o
diff --git a/drivers/input/misc/vl53L1/Makefile b/drivers/input/misc/vl53L1/Makefile
index 4dd06f8d49f8..4191dea22679 100644
--- a/drivers/input/misc/vl53L1/Makefile
+++ b/drivers/input/misc/vl53L1/Makefile
@@ -1,12 +1,10 @@
-ifneq ($(KERNELRELEASE),)
-include Kbuild
+KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
 
-else
-KDIR ?= /lib/modules/`uname -r`/build
+all:
+	$(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS)
+
+modules_install:
+	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install
 
-default:
-	CONFIG_STMVL53L1=m $(MAKE) -C $(KDIR) M=$$PWD
 clean:
-	CONFIG_STMVL53L1=m $(MAKE) -C $(KDIR) M=$$PWD clean
-
-endif
\ No newline at end of file
+	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean