summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/Android.bp7
-rw-r--r--vendor.mk6
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",
+ ],
}
diff --git a/vendor.mk b/vendor.mk
index fcb8a6af..167b58c6 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -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 \