commit 5aadf9ad17c356fd1b0a90905684869482261e4a
author Myles Watson <mylesgw@google.com> Tue Jul 11 16:08:27 2023 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Jul 12 17:07:14 2023 +0000
tree 214a0e64cfc89b84705ebb3943e351cb21f4917c
parent 85105d09b7cc0af213ef12369d22f8c064962f99

BluetoothAudio: Statically link HAL dependencies

Bug: 290666670
Bug: 289857524
Bug: 284091286
Bug: 289489060
Test: mma -j32
(cherry picked from https://android-review.googlesource.com/q/commit:44628f38d2f60a8e9c283315485d2d62605f677d)
Merged-In: I2b3c32b133e208ec2cfb1b244ccb24ad249f22df
Change-Id: I2b3c32b133e208ec2cfb1b244ccb24ad249f22df
The 32-bit libraries may not be present on the device.  This makes the test more self-contained.

bluetooth/audio/aidl/vts/Android.bp

diff --git a/bluetooth/audio/aidl/vts/Android.bp b/bluetooth/audio/aidl/vts/Android.bp
index e03fb58..5a604a1 100644
--- a/bluetooth/audio/aidl/vts/Android.bp
+++ b/bluetooth/audio/aidl/vts/Android.bp
@@ -15,11 +15,14 @@
     ],
     tidy_timeout_srcs: ["VtsHalBluetoothAudioTargetTest.cpp"],
     srcs: ["VtsHalBluetoothAudioTargetTest.cpp"],
-    shared_libs: [
+    static_libs: [
         "android.hardware.audio.common-V1-ndk",
         "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.common-V2-ndk",
         "android.hardware.common.fmq-V1-ndk",
+        "android.media.audio.common.types-V2-ndk",
+    ],
+    shared_libs: [
         "libbase",
         "libbinder_ndk",
         "libcutils",