diff --git a/Android.mk b/Android.mk
index e01148148e..b0a9e2216b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+ifeq ($(TARGET_USES_QMAA),false)
+ifeq ($(TARGET_USES_QMAA_OVERRIDE_VIDEO),true)
 VIDEO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/video-driver
 VIDEO_SELECT := CONFIG_MSM_VIDC_V4L2=m
 
@@ -34,3 +36,5 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,mmrm-module-s
 # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
+endif
+endif
diff --git a/video_kernel_board.mk b/video_kernel_board.mk
index 109b098a85..551ce0f72f 100644
--- a/video_kernel_board.mk
+++ b/video_kernel_board.mk
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 # Build video kernel driver
+ifeq ($(TARGET_USES_QMAA),false)
+ifeq ($(TARGET_USES_QMAA_OVERRIDE_VIDEO),true)
 ifneq ($(TARGET_KERNEL_DLKM_DISABLE),true)
 ifneq ($(TARGET_BOARD_AUTO),true)
 ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
@@ -9,3 +11,5 @@ BUILD_VIDEO_TECHPACK_SOURCE := true
 endif
 endif
 endif
+endif
+endif
diff --git a/video_kernel_product.mk b/video_kernel_product.mk
index 6cad4ca521..6900093826 100644
--- a/video_kernel_product.mk
+++ b/video_kernel_product.mk
@@ -1,2 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
+ifeq ($(TARGET_USES_QMAA),false)
+ifeq ($(TARGET_USES_QMAA_OVERRIDE_VIDEO),true)
 PRODUCT_PACKAGES += msm_video.ko
+endif
+endif