Evolution-X-Tensor/device_google_shusky
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: I1a9b4b621252be3b5f3046877272150f10b1295d
Signed-off-by: Jasmine Cha <chajasmine@google.com>
This commit is contained in:
Jasmine Cha 2023-12-22 12:39:49 +08:00
parent df056c2d35
commit fca432d3c3
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
audio/husky/aidl_config/audio_platform_configuration.xml
View file

@ -23,7 +23,7 @@
<feature name="PlaybackThermalThrottle"> <feature name="PlaybackThermalThrottle">
<argument name="PollWaitMs" value="20000" /> <argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" /> <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
<argument name="ThermistorType" value="SKIN" /> <argument name="ThermistorType" value="UNKNOWN" />
<argument name="ThrottlingSeverity" value="MODERATE" /> <argument name="ThrottlingSeverity" value="MODERATE" />
</feature> </feature>
<feature name="RuntimeTuningDump" /> <feature name="RuntimeTuningDump" />

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

@ -17,7 +17,7 @@
AUDIO_TABLE_FOLDER := husky AUDIO_TABLE_FOLDER := husky
# 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/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
PRODUCT_PACKAGES += audio_aidl_configs PRODUCT_PACKAGES += audio_aidl_configs

2
audio/shiba/aidl_config/audio_platform_configuration.xml
View file

@ -23,7 +23,7 @@
<feature name="PlaybackThermalThrottle"> <feature name="PlaybackThermalThrottle">
<argument name="PollWaitMs" value="20000" /> <argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" /> <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
<argument name="ThermistorType" value="SKIN" /> <argument name="ThermistorType" value="UNKNOWN" />
<argument name="ThrottlingSeverity" value="MODERATE" /> <argument name="ThrottlingSeverity" value="MODERATE" />
</feature> </feature>
<feature name="RuntimeTuningDump" /> <feature name="RuntimeTuningDump" />

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

@ -17,7 +17,7 @@
AUDIO_TABLE_FOLDER := shiba AUDIO_TABLE_FOLDER := shiba
# 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/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
PRODUCT_PACKAGES += audio_aidl_configs PRODUCT_PACKAGES += audio_aidl_configs

2
device-husky.mk
View file

@ -48,9 +48,9 @@ PRODUCT_COPY_FILES += \
CAMERA_PRODUCT ?= husky CAMERA_PRODUCT ?= husky
include device/google/shusky/audio/husky/audio-tables.mk
include device/google/shusky/camera/camera.mk include device/google/shusky/camera/camera.mk
include device/google/zuma/device-shipping-common.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 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/stm/stm20.mk include device/google/gs-common/touch/stm/stm20.mk

2
device-shiba.mk
View file

@ -32,9 +32,9 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/Wallp
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
CAMERA_PRODUCT ?= shiba CAMERA_PRODUCT ?= shiba
include device/google/shusky/audio/shiba/audio-tables.mk
include device/google/shusky/camera/camera.mk include device/google/shusky/camera/camera.mk
include device/google/zuma/device-shipping-common.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 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/gti/gti.mk include device/google/gs-common/touch/gti/gti.mk