diff --git a/config/display-product-system.mk b/config/display-product-system.mk
index 36c90ce7..e9820a8b 100644
--- a/config/display-product-system.mk
+++ b/config/display-product-system.mk
@@ -18,10 +18,13 @@ PRODUCT_PACKAGES += libdisplayconfig \
                     vendor.qti.hardware.display.config-V2-ndk_platform
 
 SOONG_CONFIG_NAMESPACES += qtidisplaycommonsys
+SOONG_CONFIG_NAMESPACES += qtiunifeddraw
 # Soong Keys
 SOONG_CONFIG_qtidisplaycommonsys := displayconfig_enabled
+SOONG_CONFIG_qtiunifeddraw := qtiunifeddraw_enabled
 # Soong Values
 SOONG_CONFIG_qtidisplaycommonsys_displayconfig_enabled := false
+SOONG_CONFIG_qtiunifeddraw_qtiunifeddraw_enabled := true
 
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     SOONG_CONFIG_qtidisplaycommonsys_displayconfig_enabled := true