diff --git a/Android.mk b/Android.mk
index 960785856b..8302bf59cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 TARGET_VIDC_ENABLE := false
-ifeq ($(TARGET_USES_QMAA),false)
-TARGET_VIDC_ENABLE := true
-endif
-ifeq ($(TARGET_USES_QMAA_OVERRIDE_VIDEO),true)
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+	ifeq ($(TARGET_KERNEL_DLKM_VIDEO_OVERRIDE), true)
+		TARGET_VIDC_ENABLE := true
+	endif
+else
 TARGET_VIDC_ENABLE := true
 endif
 
diff --git a/video_kernel_board.mk b/video_kernel_board.mk
index fe75d02f68..5f5b05b124 100644
--- a/video_kernel_board.mk
+++ b/video_kernel_board.mk
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 TARGET_VIDC_ENABLE := false
-ifeq ($(TARGET_USES_QMAA),false)
-TARGET_VIDC_ENABLE := true
-endif
-ifeq ($(TARGET_USES_QMAA_OVERRIDE_VIDEO),true)
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+	ifeq ($(TARGET_KERNEL_DLKM_VIDEO_OVERRIDE), true)
+		TARGET_VIDC_ENABLE := true
+	endif
+else
 TARGET_VIDC_ENABLE := true
 endif
 
diff --git a/video_kernel_product.mk b/video_kernel_product.mk
index 913d055755..a6e758958c 100644
--- a/video_kernel_product.mk
+++ b/video_kernel_product.mk
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 TARGET_VIDC_ENABLE := false
-ifeq ($(TARGET_USES_QMAA),false)
-TARGET_VIDC_ENABLE := true
-endif
-ifeq ($(TARGET_USES_QMAA_OVERRIDE_VIDEO),true)
+ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+	ifeq ($(TARGET_KERNEL_DLKM_VIDEO_OVERRIDE), true)
+		TARGET_VIDC_ENABLE := true
+	endif
+else
 TARGET_VIDC_ENABLE := true
 endif