diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 302ef771..0103d107 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -223,6 +223,9 @@ SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public
 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private
 SELINUX_IGNORE_NEVERALLOWS := true
 
+# SurfaceFlinger
+TARGET_USE_AOSP_SURFACEFLINGER := true
+
 # Timeservice
 BOARD_USES_QC_TIME_SERVICES := true