summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BoardConfig-common.mk13
-rw-r--r--device-common.mk15
-rw-r--r--device.mk1
3 files changed, 13 insertions, 16 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 57ca7ac9..d3021f4b 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -167,19 +167,6 @@ WIFI_FEATURE_WIFI_EXT_HAL := true
WIFI_FEATURE_IMU_DETECTION := false
WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
-# Audio
-BOARD_USES_ALSA_AUDIO := true
-AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
-AUDIO_FEATURE_ENABLED_SND_MONITOR := true
-AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
-AUDIO_FEATURE_ENABLED_CIRRUS_SPKR_PROTECTION := true
-BOARD_SUPPORTS_SOUND_TRIGGER := true
-AUDIO_FEATURE_FLICKER_SENSOR_INPUT := true
-SOUND_TRIGGER_FEATURE_LPMA_ENABLED := true
-AUDIO_FEATURE_ENABLED_MAXX_AUDIO := true
-BOARD_SUPPORTS_SOUND_TRIGGER_5514 := true
-AUDIO_FEATURE_ENABLED_24BITS_CAMCORDER := true
-
# Vendor Interface Manifest
DEVICE_MANIFEST_FILE := device/google/bonito/manifest.xml
DEVICE_MATRIX_FILE := device/google/bonito/compatibility_matrix.xml
diff --git a/device-common.mk b/device-common.mk
index 3d5a4ccf..aeef9275 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -70,9 +70,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
ro.config.low_ram = false \
ro.lmk.log_stats = true \
-# A2DP offload enabled for compilation
-AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
-
# A2DP offload supported
PRODUCT_PROPERTY_OVERRIDES += \
ro.bluetooth.a2dp_offload.supported=true
@@ -85,6 +82,18 @@ persist.bluetooth.a2dp_offload.disabled=false
PRODUCT_PROPERTY_OVERRIDES += \
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+# Audio
+$(call soong_config_set,qtiaudio,feature_24bits_camcorder,true)
+$(call soong_config_set,qtiaudio,feature_a2dp_offload,true)
+$(call soong_config_set,qtiaudio,feature_cirrus_spkr_protection,true)
+$(call soong_config_set,qtiaudio,feature_flicker_sensor_input,true)
+$(call soong_config_set,qtiaudio,feature_hwdep_cal,true)
+$(call soong_config_set,qtiaudio,feature_maxx_audio,true)
+$(call soong_config_set,qtiaudio,feature_multi_voice_sessions,true)
+$(call soong_config_set,qtiaudio,feature_snd_monitor,true)
+$(call soong_config_set,qtiaudio,feature_usb_tunnel,true)
+$(call soong_config_set,qtiaudio,feature_sound_trigger,true)
+
# Modem loging file
PRODUCT_COPY_FILES += \
device/google/bonito/init.logging.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).logging.rc
diff --git a/device.mk b/device.mk
index 9872bbf8..e700bf2f 100644
--- a/device.mk
+++ b/device.mk
@@ -22,6 +22,7 @@ PRODUCT_SOONG_NAMESPACES += \
hardware/google/camera \
hardware/google/interfaces \
hardware/google/pixel \
+ hardware/qcom/audio \
hardware/qcom/sdm845/display \
hardware/qcom/sdm845/gps \
hardware/qcom/wlan/legacy \