diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index 50d799c..3502ed8 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -26,11 +26,13 @@
     BR_FAMILY := msm8909 msm8916
     UM_3_18_FAMILY := msm8937 msm8953 msm8996
     UM_4_4_FAMILY := msm8998 sdm660
+    UM_4_9_FAMILY := sdm845
+    UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY)
 
     BOARD_USES_ADRENO := true
 
     # UM platforms no longer need this set on O+
-    ifneq ($(call is-board-platform-in-list, $(UM_3_18_FAMILY) $(UM_4_4_FAMILY)),true)
+    ifneq ($(call is-board-platform-in-list, $(UM_PLATFORMS)),true)
         TARGET_USES_QCOM_BSP := true
     endif
 
@@ -51,13 +53,18 @@
     # Allow building audio encoders
     TARGET_USES_QCOM_MM_AUDIO := true
 
-    # Enable color metadata for UM platforms
-    ifeq ($(call is-board-platform-in-list, $(UM_3_18_FAMILY) $(UM_4_4_FAMILY)),true)
+    # Enable color metadata for every UM platform
+    ifeq ($(call is-board-platform-in-list, $(UM_PLATFORMS)),true)
         TARGET_USES_COLOR_METADATA := true
     endif
 
+    # Enable DRM PP driver on UM platforms that support it
+    ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY)),true)
+        TARGET_USES_DRM_PP := true
+    endif
+
     # List of targets that use master side content protection
-    MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660
+    MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660 sdm845
 
     ifeq ($(call is-board-platform-in-list, $(B_FAMILY)),true)
         MSM_VIDC_TARGET_LIST := $(B_FAMILY)
@@ -79,6 +86,10 @@
         MSM_VIDC_TARGET_LIST := $(UM_4_4_FAMILY)
         QCOM_HARDWARE_VARIANT := msm8998
     else
+    ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY)),true)
+        MSM_VIDC_TARGET_LIST := $(UM_4_9_FAMILY)
+        QCOM_HARDWARE_VARIANT := sdm845
+    else
         MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)
         QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM)
     endif
@@ -86,6 +97,7 @@
     endif
     endif
     endif
+    endif
 
 $(call set-device-specific-path,AUDIO,audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT))
 $(call set-device-specific-path,DISPLAY,display,hardware/qcom/display-caf/$(QCOM_HARDWARE_VARIANT))
diff --git a/build/core/qcom_utils.mk b/build/core/qcom_utils.mk
index ae586eb..f36ecaa 100755
--- a/build/core/qcom_utils.mk
+++ b/build/core/qcom_utils.mk
@@ -32,7 +32,9 @@
 QCOM_BOARD_PLATFORMS += msm8998
 
 QCOM_BOARD_PLATFORMS += sdm660
+QCOM_BOARD_PLATFORMS += sdm845
 
+# MSM7000 Family
 MSM7K_BOARD_PLATFORMS := msm7x30
 MSM7K_BOARD_PLATFORMS += msm7x27
 MSM7K_BOARD_PLATFORMS += msm7x27a