diff options
| author | Enrico Granata <egranata@google.com> | 2022-07-21 14:04:26 -0600 |
|---|---|---|
| committer | Enrico Granata <egranata@google.com> | 2022-07-21 14:07:33 -0600 |
| commit | aa3f38147fa33a8f25821e54988d05466459739f (patch) | |
| tree | 2fecb5b9d308762e618a038bfdc93d8a27ca4af1 | |
| parent | c5633681d0cf0c3e1e6d0e8f709a42ddd08fcb60 (diff) | |
| download | cuttlefish-aa3f38147fa33a8f25821e54988d05466459739f.tar.gz | |
Move Audio Effects HAL into its own manifest chunk
Some downstream devices use Audio HAL v6, but because cuttlefish's
manifest hardcodes Audio Effects v7, audioflinger cannot start
the primary audio library because it detects a mismatch of versions
In the longer run, an architecture where all cuttlefish and derived
devices use the same Audio HAL may be optimal, but for this release
move the effects HAL manifest into its own fragment that is only
built when no custom audio packages are selected at build time
Bug: 239744244
Test: build and boot trout, hear audio working
Change-Id: I841989d7b5d76ccbaf9c864b4002c32062c23c39
| -rw-r--r-- | guest/hals/audio/effects/manifest.xml | 22 | ||||
| -rw-r--r-- | shared/config/manifest.xml | 9 | ||||
| -rw-r--r-- | shared/device.mk | 2 |
3 files changed, 24 insertions, 9 deletions
diff --git a/guest/hals/audio/effects/manifest.xml b/guest/hals/audio/effects/manifest.xml new file mode 100644 index 000000000..6b4e832ae --- /dev/null +++ b/guest/hals/audio/effects/manifest.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2022, The Android Open Source Project. +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** limitations under the License. +*/ +--> + +<manifest version="1.0" type="device"> + <hal format="hidl"> + <name>android.hardware.audio.effect</name> + <transport>hwbinder</transport> + <version>7.0</version> + <interface> + <name>IEffectsFactory</name> + <instance>default</instance> + </interface> + </hal> +</manifest> diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml index 126557fa6..893dbfa1b 100644 --- a/shared/config/manifest.xml +++ b/shared/config/manifest.xml @@ -18,15 +18,6 @@ --> <manifest version="1.0" type="device" target-level="7"> <hal format="hidl"> - <name>android.hardware.audio.effect</name> - <transport>hwbinder</transport> - <version>7.0</version> - <interface> - <name>IEffectsFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.authsecret</name> <transport>hwbinder</transport> <version>1.0</version> diff --git a/shared/device.mk b/shared/device.mk index 04dedbd57..42af5f2be 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -468,6 +468,8 @@ LOCAL_AUDIO_PRODUCT_PACKAGE := \ android.hardware.audio.service \ android.hardware.audio@7.1-impl.ranchu \ android.hardware.audio.effect@7.0-impl +DEVICE_MANIFEST_FILE += \ + device/google/cuttlefish/guest/hals/audio/effects/manifest.xml endif ifndef LOCAL_AUDIO_PRODUCT_COPY_FILES |