Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2"

1 files changed, 20 insertions, 4 deletions

diff --git a/modules/usbaudio/Android.bp b/modules/usbaudio/Android.bp
index c7d403f5..9f787532 100644
--- a/modules/usbaudio/Android.bp
+++ b/modules/usbaudio/Android.bp
@@ -12,18 +12,34 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library_shared {
-    name: "audio.usb.default",
+cc_defaults {
+    name: "audio.usb_defaults",
     relative_install_path: "hw",
     vendor: true,
     srcs: ["audio_hal.c"],
     shared_libs: [
         "liblog",
         "libcutils",
-        "libtinyalsa",
         "libaudioutils",
-        "libalsautils",
     ],
     cflags: ["-Wno-unused-parameter"],
     header_libs: ["libhardware_headers"],
 }
+
+cc_library_shared {
+    name: "audio.usb.default",
+    defaults: ["audio.usb_defaults"],
+    shared_libs: [
+        "libtinyalsa",
+        "libalsautils",
+    ],
+}
+
+cc_library_shared {
+    name: "audio.usbv2.default",
+    defaults: ["audio.usb_defaults"],
+    shared_libs: [
+        "libtinyalsav2",
+        "libalsautilsv2",
+    ],
+}