Evolution-X-Tensor/device_google_caimito
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audio: use USE_AUDIO_HAL_AIDL instead flag variable

Browse source 
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: If14c782bdd548f07b42b5e710236de9f20a6ac4d
Signed-off-by: Jasmine Cha <chajasmine@google.com>
This commit is contained in:
Jasmine Cha 2023-12-22 10:29:43 +08:00
parent bcb2809db3
commit 175b8e774e
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
audio/caiman/audio-tables.mk
View file

@ -17,7 +17,7 @@
AUDIO_TABLE_FOLDER := caiman AUDIO_TABLE_FOLDER := caiman
# Choose AIDL config by build flag. # Choose AIDL config by build flag.
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) ifeq ($(USE_AUDIO_HAL_AIDL),true)
PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
PRODUCT_PACKAGES += audio_aidl_configs PRODUCT_PACKAGES += audio_aidl_configs

2
audio/komodo/audio-tables.mk
View file

@ -17,7 +17,7 @@
AUDIO_TABLE_FOLDER := komodo AUDIO_TABLE_FOLDER := komodo
# Choose AIDL config by build flag. # Choose AIDL config by build flag.
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) ifeq ($(USE_AUDIO_HAL_AIDL),true)
PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
PRODUCT_PACKAGES += audio_aidl_configs PRODUCT_PACKAGES += audio_aidl_configs

2
audio/tokay/audio-tables.mk
View file

@ -17,7 +17,7 @@
AUDIO_TABLE_FOLDER := tokay AUDIO_TABLE_FOLDER := tokay
# Choose AIDL config by build flag. # Choose AIDL config by build flag.
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) ifeq ($(USE_AUDIO_HAL_AIDL),true)
PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
PRODUCT_PACKAGES += audio_aidl_configs PRODUCT_PACKAGES += audio_aidl_configs

2
device-caiman.mk
View file

@ -33,8 +33,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# display # display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay
include device/google/caimito/audio/caiman/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk include device/google/zumapro/device-shipping-common.mk
include device/google/caimito/audio/caiman/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/syna/syna20.mk include device/google/gs-common/touch/syna/syna20.mk

2
device-komodo.mk
View file

@ -33,8 +33,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# display # display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay
include device/google/caimito/audio/komodo/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk include device/google/zumapro/device-shipping-common.mk
include device/google/caimito/audio/komodo/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/syna/syna20.mk include device/google/gs-common/touch/syna/syna20.mk

2
device-tokay.mk
View file

@ -26,8 +26,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# display # display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
include device/google/caimito/audio/tokay/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk include device/google/zumapro/device-shipping-common.mk
include device/google/caimito/audio/tokay/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/syna/syna20.mk include device/google/gs-common/touch/syna/syna20.mk