b41b575475
In O, the Audio effect V2 HAL allows not to have an audio effect XML configuration but to use a .conf format. In P, before this patch, the Audio effect V2 HAL _requires_ to have an audio effect XML configuration and forbids the use of a .conf format. This is discouraged by Treble as it means that an unchanged HAL V2 implementation that was compatible with O VTS will not be with P VTS. As a result, revert to the Oreo behavior for Audio Effect V2 VTS. Note that the audio effect V4 VTS is not changed by this patch and still requires an audio effect XML configuration. Aka device _updating_ to P will not have to upgrade to XML but new devices lunching on P are still required to have an audio effect XML configuration. This commit only changes VTS code. Test: cd hardware/interfaces/audio/effect/ mmm 2.0/vts/functional 4.0/vts/functional && adb sync data adb push *.0/xml/audio_effects_conf_V*.xsd /data/local/tmp/ adb shell cd /data/nativetest64 OPS=--gtest_filter=CheckConfig.audioEffectsConfigurationValidation VtsHalAudioEffectV2_0TargetTest/VtsHalAudioEffectV2_0TargetTest $OPS VtsHalAudioEffectV4_0TargetTest/VtsHalAudioEffectV4_0TargetTest $OPS rm /{odm,vendor,system}/etc/audio_effects.xml || true VtsHalAudioEffectV2_0TargetTest/VtsHalAudioEffectV2_0TargetTest $OPS ! VtsHalAudioEffectV4_0TargetTest/VtsHalAudioEffectV4_0TargetTest $OPS Bug: 111421676 Change-Id: Ifb15d65ae4aa65759c8ebaa91cbc8c02234030dc Signed-off-by: Kevin Rocard <krocard@google.com> |
||
---|---|---|
.. | ||
2.0 | ||
4.0 | ||
common | ||
core | ||
effect | ||
README |
Directory structure of the audio HIDL related code. audio |-- 2.0 <== HIDL (.hal) can not be moved to fit the directory structure | because that would create a separate HAL |-- 4.0 <== Version 4.0 of the core API | |-- common <== code common to audio core and effect API | |-- 2.0 | | |-- default <== code that wraps the legacy API | | `-- vts <== vts of 2.0 core and effect API common code | |-- 4.0 | | |-- default | | `-- vts | |-- ... <== The future versions should continue this structure | | |-- default | | `-- vts | `-- all_versions <== code common to all version of both core and effect API | |-- default | `-- vts <== vts of core and effect API common version independent code | |-- core <== code relative to the core API | |-- 2.0 <== 2.0 core API code (except .hal, see audio/2.0) | | |-- default | | `-- vts | |-- 4.0 | | |-- default <== default implementation of the core 4.0 api | | `-- vts <== vts code of the 4.0 API | |-- ... | | |-- default | | `-- vts | `-- all_versions | |-- default | `-- vts <== vts of core API common version independent code | `-- effect <== idem for the effect API |-- 2.0 | |-- default | `-- vts |-- 4.0 | |-- default | `-- vts |-- ... | |-- default | `-- vts `-- all_versions |-- default `-- vts