diff options
| author | John Stultz <john.stultz@linaro.org> | 2016-06-03 11:37:21 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-06-03 14:18:14 -0700 |
| commit | df14a5eb044fcb3cb37b0095213cc715de17b4b1 (patch) | |
| tree | daa11199195b7bcb0d220d73996f7497b2d5e25f | |
| parent | e637ba5fec76ef175cfad04630d58943a3836b9b (diff) | |
| download | hikey-df14a5eb044fcb3cb37b0095213cc715de17b4b1.tar.gz | |
hikey: Enable usb audio support
It was noticed on the 96boards forum by user "niruyadla"
that USB audio support was missing, so this patch enables
it along with adding tinyplay for help w/ testing.
Also adds r_submix and tweaks audio policy to be consistent
Change-Id: Ia65468ddd2144b2cba3304fefcefbe01574ab772
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | audio/audio_policy.conf | 4 | ||||
| -rw-r--r-- | device.mk | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf index dc1c6537..82b59795 100644 --- a/audio/audio_policy.conf +++ b/audio/audio_policy.conf @@ -71,8 +71,8 @@ audio_hw_modules { inputs { usb_device { sampling_rates dynamic - channel_masks AUDIO_CHANNEL_IN_STEREO - formats AUDIO_FORMAT_PCM_16_BIT + channel_masks dynamic + formats dynamic devices AUDIO_DEVICE_IN_USB_DEVICE } } @@ -49,8 +49,12 @@ PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \ # Build and run only ART PRODUCT_RUNTIMES := runtime_libart_default -# Build BT a2dp audio HAL -PRODUCT_PACKAGES += audio.a2dp.default +# Build HiKey HDMI, bluetooth a2dp and usb audio HALs +PRODUCT_PACKAGES += audio.primary.hikey \ + audio.a2dp.default \ + audio.usb.default \ + audio.r_submix.default \ + tinyplay # Include USB speed switch App PRODUCT_PACKAGES += UsbSpeedSwitch @@ -61,9 +65,6 @@ PRODUCT_PACKAGES += libion # Build gralloc for hikey PRODUCT_PACKAGES += gralloc.hikey -# Build Audio Hal for hikey -PRODUCT_PACKAGES += audio.primary.hikey - # Set zygote config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc @@ -80,7 +81,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \ frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \ frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml + frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ + frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml # Include vendor binaries $(call inherit-product-if-exists, vendor/linaro/hikey/device-vendor.mk) |