commit 86ee64e6ea9c738affe278f901547f1155ff08ae
author Mike Lockwood <lockwood@google.com> Thu Apr 26 11:16:24 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 26 11:16:24 2012 -0700
tree 819a8fc27e9c1e05c201cfac8047798f9550bf05
parent 39355d4ba01b545a541b7da8cedf57391f5387ed
parent 1e50ab955ad8505660591523f6903d3370663e45

Merge "Add USB audio HAL to the build" into jb-dev

device_base.mk

diff --git a/device_base.mk b/device_base.mk
index f83fed9..08e8cdc 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -148,7 +148,8 @@
 PRODUCT_PACKAGES += \
 	audio_policy.herring \
 	audio.primary.herring \
-	audio.a2dp.default
+	audio.a2dp.default \
+	audio.usb.default
 
 PRODUCT_COPY_FILES += \
 	device/samsung/crespo/libaudio/audio_policy.conf:system/etc/audio_policy.conf

libaudio/audio_policy.conf

diff --git a/libaudio/audio_policy.conf b/libaudio/audio_policy.conf
index 592af23..2c2c590 100644
--- a/libaudio/audio_policy.conf
+++ b/libaudio/audio_policy.conf
@@ -49,4 +49,20 @@
       }
     }
   }
+  usb {
+    outputs {
+      usb_accessory {
+        sampling_rates 44100
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_USB_ACCESSORY
+      }
+      usb_device {
+        sampling_rates 44100
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_USB_DEVICE
+      }
+    }
+  }
 }