diff --git a/Android.mk b/Android.mk
index bae485b595..c9e4a63290 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,11 @@
+CAMERA_DLKM_ENABLED := true
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+	ifeq ($(TARGET_KERNEL_DLKM_CAMERA_OVERRIDE), false)
+		CAMERA_DLKM_ENABLED := false;
+	endif
+endif
+
+ifeq ($(CAMERA_DLKM_ENABLED),true)
 ifeq ($(call is-board-platform-in-list, $(TARGET_BOARD_PLATFORM)),true)
 
 # Make target to specify building the camera.ko from within Android build system.
@@ -48,3 +56,4 @@ include $(DLKM_DIR)/Build_external_kernelmodule.mk
 endif
 
 endif # End of check for board platform
+endif # ifeq ($(CAMERA_DLKM_ENABLED),true)
diff --git a/board.mk b/board.mk
index c8441eb9ba..a69ba64cb0 100644
--- a/board.mk
+++ b/board.mk
@@ -1,6 +1,15 @@
 # Build camera kernel driver
+CAMERA_DLKM_ENABLED := true
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+	ifeq ($(TARGET_KERNEL_DLKM_CAMERA_OVERRIDE), false)
+		CAMERA_DLKM_ENABLED := false;
+	endif
+endif
+
+ifeq ($(CAMERA_DLKM_ENABLED),true)
 ifneq ($(TARGET_BOARD_AUTO),true)
 ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/camera.ko
 endif
 endif
+endif
diff --git a/product.mk b/product.mk
index b77946bab8..f1702f03ed 100644
--- a/product.mk
+++ b/product.mk
@@ -1 +1,10 @@
+CAMERA_DLKM_ENABLED := true
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+	ifeq ($(TARGET_KERNEL_DLKM_CAMERA_OVERRIDE), false)
+		CAMERA_DLKM_ENABLED := false;
+	endif
+endif
+
+ifeq ($(CAMERA_DLKM_ENABLED),true)
 PRODUCT_PACKAGES += camera.ko
+endif