diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Android.mk b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Android.mk
index 240c5508a037..05f303839955 100644
--- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Android.mk
+++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Android.mk
@@ -14,7 +14,9 @@ ifneq ($(findstring synaptics_i2c.ko,$(BOARD_VENDOR_KERNEL_MODULES)),)
 else
     LOCAL_MODULE := synaptics_spi.ko
 endif
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/mmi_info.ko
 
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Kbuild b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Kbuild
index dc356420f482..e7f7c8edf017 100644
--- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Kbuild
+++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Kbuild
@@ -5,7 +5,7 @@ EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
 
 ifneq ($(filter m y,$(USE_TOUCHSCREEN_MMI_I2C)),)
     obj-m += synaptics_i2c.o
-    KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../../mmi_info/Module.symvers
+    KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../../../mmi_info/$(GKI_OBJ_MODULE_DIR)/Module.symvers
 else
     obj-m += synaptics_spi.o
 endif
diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Android.mk b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Android.mk
index 789915335605..7333abeb6c1c 100644
--- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Android.mk
+++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Android.mk
@@ -20,10 +20,10 @@ ifneq ($(findstring touchscreen_mmi.ko,$(BOARD_VENDOR_KERNEL_MODULES)),)
     LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/touchscreen_mmi.ko
 endif
 ifneq ($(findstring synaptics_i2c.ko,$(BOARD_VENDOR_KERNEL_MODULES)),)
-    LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/mmi_info.ko
     LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/synaptics_i2c.ko
 else
     LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/synaptics_spi.ko
 endif
 
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Kbuild b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Kbuild
index 1790fbab5643..ee1274c3aaf2 100644
--- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Kbuild
+++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Kbuild
@@ -12,7 +12,7 @@ endif
 ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_MMI)),)
 	EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI
 	synaptics_core_module-objs += synaptics_ts_mmi.o
-	KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../touchscreen_mmi/Module.symvers
+	KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../touchscreen_mmi/$(GKI_OBJ_MODULE_DIR)/Module.symvers
 endif
 
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../synaptics_bus/Module.symvers
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../synaptics_bus/$(GKI_OBJ_MODULE_DIR)/Module.symvers
diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Android.mk b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Android.mk
index 464b6972f79e..efb851d1b811 100644
--- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Android.mk
+++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Android.mk
@@ -19,6 +19,7 @@ LOCAL_MODULE := synaptics_device.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
 
 include $(CLEAR_VARS)
@@ -26,6 +27,7 @@ LOCAL_MODULE := synaptics_diagnostics.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
 
 include $(CLEAR_VARS)
@@ -33,6 +35,7 @@ LOCAL_MODULE := synaptics_recovery.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
 
 include $(CLEAR_VARS)
@@ -40,6 +43,7 @@ LOCAL_MODULE := synaptics_reflash.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
 
 include $(CLEAR_VARS)
@@ -47,6 +51,7 @@ LOCAL_MODULE := synaptics_testing.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
 
 include $(CLEAR_VARS)
@@ -54,5 +59,6 @@ LOCAL_MODULE := synaptics_zeroflash.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko
+KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
 include $(DLKM_DIR)/AndroidKernelModule.mk
 
diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Kbuild b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Kbuild
index fef3b94fc612..a061f18d34a0 100644
--- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Kbuild
+++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Kbuild
@@ -16,4 +16,4 @@ endif
 ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_MMI)),)
 	EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI
 endif
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../synaptics_core/Module.symvers
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../synaptics_core/$(GKI_OBJ_MODULE_DIR)/Module.symvers