diff --git a/android/app/Android.bp b/android/app/Android.bp
index 7b98878785b562b0c48ec70fd4c753ae056eb887..aee08c0eeeac4a5e5a7bf16f24a252b7828e40cd 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -105,6 +105,7 @@ cc_library_shared {
     shared_libs: [
         "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.bluetooth.audio@2.0",
+        "android.hardware.bluetooth.audio@2.1",
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
         "android.system.suspend-V1-ndk",
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 26ca64737019b1e53bdc30359248303f85db05bd..8d013ac80c00af74e01aae45fe05280e31d1d638 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -133,6 +133,9 @@ cc_library_static {
         "libbt-bta-core",
         "libcom.android.sysprop.bluetooth",
     ],
+    shared_libs: [
+        "android.hardware.bluetooth.audio@2.1",
+    ],
     generated_headers: [
         "LeAudioSetConfigSchemas_h",
     ],
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 802c80b15791725668c46a87a505ead24355e308..4cf28f4ff93aba74ec65b8a21806a4e47a88e811 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -156,6 +156,9 @@ cc_library_static {
         "libbt-stack-core",
         "libbtif-core",
     ],
+    shared_libs: [
+        "android.hardware.bluetooth.audio@2.1",
+    ],
     cflags: [
         "-DBUILDCFG",
     ],
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 6a49eb0a247e7cf62377e931205168e5bd8c1b02..21da9691e333040159ec547ac225c0b9992ed4ac 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -116,7 +116,6 @@ cc_defaults {
         "com.android.btservices",
     ],
     shared_libs: [
-        "android.hardware.bluetooth.audio@2.1",
         "libbase",
         "libcrypto",
     ],