diff options
author | Roman Kiryanov <rkir@google.com> | 2020-07-21 19:18:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 19:18:19 +0000 |
commit | d7566222eb5c8a67ffd49ec582c0a680d09c6db4 (patch) | |
tree | d4a1bfdc0701c90e69546efce02be8c252a1a94a | |
parent | 937168a77053e9920a1fe68182a094987d850d07 (diff) | |
parent | 2edb47ece0ba2439e6752c5bdedc1cb2e8dd903a (diff) | |
download | device_generic_goldfish-d7566222eb5c8a67ffd49ec582c0a680d09c6db4.tar.gz device_generic_goldfish-d7566222eb5c8a67ffd49ec582c0a680d09c6db4.tar.bz2 device_generic_goldfish-d7566222eb5c8a67ffd49ec582c0a680d09c6db4.zip |
Move r_submix implementation into audio.service.ranchu am: 2edb47ece0
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/12197508
Change-Id: I8d1bc791c838f5fe85d867e6ef926c44d5c79ef9
-rw-r--r-- | audio/Android.bp | 7 | ||||
-rw-r--r-- | vendor.mk | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/audio/Android.bp b/audio/Android.bp index 9779ebd4..27dfbf8e 100644 --- a/audio/Android.bp +++ b/audio/Android.bp @@ -54,4 +54,11 @@ cc_binary { cflags: [ "-DLOG_TAG=\"android.hardware.audio.service.ranchu\"", ], + // android.hardware.audio.service.ranchu loads android.hardware.audio@6.0-impl + // which loads audio.r_submix.default which provides the r_submix device, + // see b/161485545. Should be retired once a better r_submix is available. + required: [ + "android.hardware.audio@6.0-impl", + "audio.r_submix.default", + ], } @@ -155,12 +155,6 @@ PRODUCT_PACKAGES += \ android.hardware.soundtrigger@2.2-impl.ranchu \ android.hardware.audio.effect@6.0-impl \ -# android.hardware.audio@6.0-impl is required to load audio.r_submix.default. -# See b/161485545. Should be retired once the bug is resolved. -PRODUCT_PACKAGES += \ - android.hardware.audio@6.0-impl \ - audio.r_submix.default - PRODUCT_COPY_FILES += \ device/generic/goldfish/audio/policy/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ device/generic/goldfish/audio/policy/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \ |