diff --git a/device-comet.mk b/device-comet.mk
index c0e7b13..2eb3f37 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -33,8 +33,12 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/comet/comet/overlay
 
-include device/google/zumapro/device-shipping-common.mk
+ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
+USE_AUDIO_HAL_AIDL := true
+endif
+
 include device/google/comet/audio/comet/audio-tables.mk
+include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/gti.mk