From fca432d3c3ce2f7d90ba7768655fd3df56b6adb0 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 22 Dec 2023 12:39:49 +0800 Subject: [PATCH] audio: use USE_AUDIO_HAL_AIDL instead flag variable The value of USE_AUDIO_HAL_AIDL is defined in project settings which decide when to use aidl or hidl hal. So, correct audio tables can be included properly. Bug: 317444263 Test: boot to home, check basic audio functions Change-Id: I1a9b4b621252be3b5f3046877272150f10b1295d Signed-off-by: Jasmine Cha --- audio/husky/aidl_config/audio_platform_configuration.xml | 2 +- audio/husky/audio-tables.mk | 2 +- audio/shiba/aidl_config/audio_platform_configuration.xml | 2 +- audio/shiba/audio-tables.mk | 2 +- device-husky.mk | 2 +- device-shiba.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index 1e775b2..c7db1ee 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -23,7 +23,7 @@ - + diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index e1b429a..7cbcdf4 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -17,7 +17,7 @@ AUDIO_TABLE_FOLDER := husky # Choose AIDL config by build flag. -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) +ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml index 1e775b2..c7db1ee 100644 --- a/audio/shiba/aidl_config/audio_platform_configuration.xml +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -23,7 +23,7 @@ - + diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index b5e8045..a21cd56 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -17,7 +17,7 @@ AUDIO_TABLE_FOLDER := shiba # Choose AIDL config by build flag. -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) +ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs diff --git a/device-husky.mk b/device-husky.mk index dd55184..4c440e0 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -48,9 +48,9 @@ PRODUCT_COPY_FILES += \ CAMERA_PRODUCT ?= husky -include device/google/shusky/audio/husky/audio-tables.mk include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk +include device/google/shusky/audio/husky/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm20.mk diff --git a/device-shiba.mk b/device-shiba.mk index ae2326e..565ea6c 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -32,9 +32,9 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/Wallp DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay CAMERA_PRODUCT ?= shiba -include device/google/shusky/audio/shiba/audio-tables.mk include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk +include device/google/shusky/audio/shiba/audio-tables.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