diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 222b996c..ee73c094 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -251,8 +251,9 @@ endif
 # SoundTriggerHAL Configuration
 #BOARD_USE_SOUNDTRIGGER_HAL := false
 
-# Vibrator HAL actuator model configuration
+# Vibrator HAL actuator model and adaptive haptics configuration
 $(call soong_config_set,haptics,actuator_model,$(ACTUATOR_MODEL))
+$(call soong_config_set,haptics,adaptive_haptics_feature,$(ADAPTIVE_HAPTICS_FEATURE))
 
 # HWComposer
 BOARD_HWC_VERSION := hwc3