summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Li <dvdli@google.com>2021-02-03 01:33:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-03 01:33:25 +0000
commitb956508fa6831a27ae0d430b24c719cc3125d067 (patch)
tree93ceddbfd5bd1e8432e046e9a943d858835ccf4f
parent4ca7eb33b5a7550cc05459e060ede16cc5931b45 (diff)
parentbd8ee49f8bf5ac3041571bceab597c6cfa8348c4 (diff)
downloadlibhardware-b956508fa6831a27ae0d430b24c719cc3125d067.tar.gz
Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2" am: bd8ee49f8b
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566240 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I689db4fd3cc57044fea5b5d8bb988bb6ff5ce6ae
-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",
+ ],
+}