Update BT Stack to use BT Audio HAL V2
Bug: 226441860
Test: A2DP sink device using bds-dev
Ignore-AOSP-First: Merge to internal and cherry-pick to AOSP
Change-Id: Idbde911cabe454c675a85a98624440ab44d7872a
diff --git a/system/audio_bluetooth_hw/Android.bp b/system/audio_bluetooth_hw/Android.bp
index 25e1f8c..9dc7f53 100644
--- a/system/audio_bluetooth_hw/Android.bp
+++ b/system/audio_bluetooth_hw/Android.bp
@@ -22,7 +22,7 @@
],
header_libs: ["libhardware_headers"],
shared_libs: [
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
"libbluetooth_audio_session_aidl",
"libaudioutils",
"libbase",
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index ec3963f..57a524d 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -34,7 +34,7 @@
shared_libs: [
"libfmq",
"libbinder_ndk",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
],
srcs: [
"aidl/a2dp_encoding_aidl.cc",
@@ -85,7 +85,7 @@
shared_libs: [
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
"libbinder_ndk",
"libcutils",
"libfmq",
diff --git a/system/audio_hal_interface/fuzzer/Android.bp b/system/audio_hal_interface/fuzzer/Android.bp
index 704624f..ac74f13 100644
--- a/system/audio_hal_interface/fuzzer/Android.bp
+++ b/system/audio_hal_interface/fuzzer/Android.bp
@@ -37,7 +37,7 @@
"libstatslog",
"libbinder_ndk",
"libstatssocket",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
"android.hardware.bluetooth@1.0",
"android.hardware.bluetooth@1.1",
"android.hardware.bluetooth.a2dp@1.0",
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index fb40322..306405d 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -654,7 +654,7 @@
android: {
shared_libs: [
"libbinder_ndk",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
],
},
},
@@ -768,7 +768,7 @@
android: {
shared_libs: [
"libbinder_ndk",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
],
},
},
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index a41afd8..8fdcf037 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -246,7 +246,7 @@
android: {
shared_libs: [
"libbinder_ndk",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
],
},
},
@@ -480,7 +480,7 @@
android: {
shared_libs: [
"libbinder_ndk",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
],
},
},
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 789b573..845fdde 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -216,7 +216,7 @@
shared_libs: [
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
"android.hardware.bluetooth@1.0",
"android.hardware.bluetooth@1.1",
"android.system.suspend-V1-ndk",
diff --git a/system/service/Android.bp b/system/service/Android.bp
index 0ed428a..92d71fc 100644
--- a/system/service/Android.bp
+++ b/system/service/Android.bp
@@ -145,7 +145,7 @@
target: {
android: {
shared_libs: [
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
],
},
},
@@ -229,7 +229,7 @@
"libbluetooth-binder-common",
],
shared_libs: [
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
"android.system.suspend-V1-ndk",
"libbinder",
"libvndksupport",
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index cc31a59..ed27939 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -229,7 +229,7 @@
"android.hardware.bluetooth@1.1",
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
"libaaudio",
"libbinder_ndk",
"libcutils",
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index ca3c6a3..54812c0 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/Android.bp
@@ -51,7 +51,7 @@
"android.hardware.bluetooth.a2dp@1.0",
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
"android.system.suspend.control-V1-ndk",
"libaaudio",
"libbinder_ndk",
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index 36e33f7..42b222f 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -72,7 +72,7 @@
"android.hardware.bluetooth@1.1",
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
"android.system.suspend-V1-ndk",
"libaaudio",
"libbase",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 4d45f81..b7fd0ed 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -100,7 +100,7 @@
target: {
android: {
shared_libs: [
- "android.hardware.bluetooth.audio-V1-ndk",
+ "android.hardware.bluetooth.audio-V2-ndk",
],
},
},