summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDavid Li <dvdli@google.com>2021-02-03 02:56:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-03 02:56:34 +0000
commit79f27ce9dda20e81e1329963bffff6f8f6961650 (patch)
treec24d4f6f34f4b1ab88a7df5e02c69f76d564c789 /modules
parent34c2324d54237f54f58c4ab6ec0c4eb414c7fece (diff)
parent350d58611616e68267137e06b39702541d854177 (diff)
Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2" am: bd8ee49f8b am: b956508fa6 am: 350d586116
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566240 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9632f86ac1e5b8cbf16e28e2ecc36b7ae013315
Diffstat (limited to 'modules')
-rw-r--r--modules/usbaudio/Android.bp24
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",
+ ],
+}