summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/app/Android.bp1
-rw-r--r--system/audio_hal_interface/Android.bp2
-rw-r--r--system/bta/Android.bp16
-rw-r--r--system/btcore/Android.bp2
-rw-r--r--system/btif/Android.bp10
-rw-r--r--system/build/Android.bp1
-rw-r--r--system/common/Android.bp6
-rw-r--r--system/device/Android.bp3
-rw-r--r--system/device/fuzzer/Android.bp1
-rw-r--r--system/hci/Android.bp1
-rw-r--r--system/main/Android.bp7
-rw-r--r--system/osi/Android.bp6
-rw-r--r--system/profile/avrcp/Android.bp3
-rw-r--r--system/stack/Android.bp27
-rw-r--r--system/stack/test/fuzzers/Android.bp1
-rw-r--r--system/test/suite/Android.bp1
-rw-r--r--system/udrv/Android.bp1
17 files changed, 85 insertions, 4 deletions
diff --git a/android/app/Android.bp b/android/app/Android.bp
index 990d6e8347..4aa6be714c 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -110,6 +110,7 @@ cc_library_shared {
"libbt-sbc-encoder",
"libbt-stack",
"libbt-stack-core",
+ "libbt_shim_bridge",
"libbtcore",
"libbtdevice",
"libbte",
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index 59eee9dfa1..acb92ae6e6 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -27,6 +27,7 @@ cc_library_static {
],
static_libs: [
"libbt-common",
+ "libbt_shim_bridge",
"libosi",
],
target: {
@@ -100,6 +101,7 @@ cc_test {
static_libs: [
"libbt-audio-hal-interface",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
],
cflags: [
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 671c88b913..d3b6493f9f 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -133,6 +133,7 @@ cc_library_static {
"libbluetooth_gd",
"libbt-bta-core",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libcom.android.sysprop.bluetooth",
],
shared_libs: [
@@ -192,6 +193,7 @@ cc_library_static {
static_libs: [
"lib-bt-packets",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libcom.android.sysprop.bluetooth",
],
apex_available: [
@@ -247,6 +249,7 @@ cc_test {
"libbt-bta-core",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtcore",
"libchrome",
"libcom.android.sysprop.bluetooth",
@@ -294,6 +297,7 @@ cc_test {
"libbt-bta-core",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtcore",
"libchrome",
"libosi",
@@ -411,6 +415,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtcore",
"libbtdevice",
"libchrome",
@@ -473,6 +478,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
"libosi",
@@ -518,6 +524,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
"libosi",
@@ -575,6 +582,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
"libosi",
@@ -719,6 +727,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libflatbuffers-cpp",
@@ -814,6 +823,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libflatbuffers-cpp",
@@ -890,6 +900,7 @@ cc_test {
"libbt-audio-hal-interface",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libflatbuffers-cpp",
@@ -953,6 +964,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
"libosi",
@@ -1008,6 +1020,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
],
@@ -1072,6 +1085,7 @@ cc_test {
"libbluetooth-types",
"libbt-audio-hal-interface",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libgmock",
@@ -1133,6 +1147,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
],
@@ -1197,6 +1212,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libcom.android.sysprop.bluetooth",
"libevent",
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index 8892fde3cb..a946aa57d7 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -55,6 +55,7 @@ cc_library_static {
cflags: ["-D_GNU_SOURCE"],
},
},
+ static_libs: ["libbt_shim_bridge"],
}
cc_library_static {
@@ -65,6 +66,7 @@ cc_library_static {
],
defaults: ["libbtcore_defaults"],
min_sdk_version: "Tiramisu",
+ static_libs: ["libbt_shim_bridge"],
}
cc_library_headers {
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 7ef85e905c..0a70ed12f2 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -153,6 +153,7 @@ cc_library_static {
"libbt-platform-protos-lite",
"libbt-stack",
"libbt-stack-core",
+ "libbt_shim_bridge",
"libbtif-core",
],
shared_libs: [
@@ -230,6 +231,7 @@ cc_library_static {
"libbt-audio-hal-interface",
"libbt-platform-protos-lite",
"libbt-stack-core",
+ "libbt_shim_bridge",
"libstatslog_bt",
],
shared_libs: [
@@ -297,6 +299,7 @@ cc_test {
"libbt-sbc-encoder",
"libbt-stack",
"libbt-stack-core",
+ "libbt_shim_bridge",
"libbtcore",
"libbtdevice",
"libbtif",
@@ -350,6 +353,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbluetooth_gd",
+ "libbt_shim_bridge",
"libchrome",
"libosi",
],
@@ -382,6 +386,7 @@ cc_test {
],
static_libs: [
"libbluetooth-types",
+ "libbt_shim_bridge",
"libchrome",
"libosi",
],
@@ -421,6 +426,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
],
@@ -464,6 +470,7 @@ cc_test {
],
static_libs: [
"libbluetooth-types",
+ "libbt_shim_bridge",
"libc++fs",
"libchrome",
"libgmock",
@@ -500,6 +507,7 @@ cc_test {
],
static_libs: [
"libbluetooth-types",
+ "libbt_shim_bridge",
"libchrome",
"libcom.android.sysprop.bluetooth",
"libosi",
@@ -607,6 +615,7 @@ cc_test {
"libbt-sbc-encoder",
"libbt-stack",
"libbt-stack-core",
+ "libbt_shim_bridge",
"libbtdevice",
"libbtif",
"libbtif-core",
@@ -740,6 +749,7 @@ cc_test {
"libbt-platform-protos-lite",
"libbt-sbc-decoder",
"libbt-sbc-encoder",
+ "libbt_shim_bridge",
"libbtdevice",
"libbtif",
"libbtif-core",
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 9ea1dfd4df..0caa1a1ad7 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -33,7 +33,6 @@ cc_defaults {
},
defaults: ["fluoride_types_defaults_fuzzable"],
static_libs: [
- "libbt_shim_bridge",
"libbt_shim_ffi",
],
}
diff --git a/system/common/Android.bp b/system/common/Android.bp
index ff3a487f98..61632dba82 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -53,7 +53,10 @@ cc_library_static {
],
min_sdk_version: "Tiramisu",
header_libs: ["libbluetooth_headers"],
- static_libs: ["libbt-platform-protos-lite"],
+ static_libs: [
+ "libbt-platform-protos-lite",
+ "libbt_shim_bridge",
+ ],
}
cc_test {
@@ -99,6 +102,7 @@ cc_test {
"libbluetooth-types",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libgmock",
diff --git a/system/device/Android.bp b/system/device/Android.bp
index e6acea27b3..5d8f318171 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -33,6 +33,7 @@ cc_library_static {
],
min_sdk_version: "Tiramisu",
header_libs: ["libbluetooth_headers"],
+ static_libs: ["libbt_shim_bridge"],
}
// Bluetooth device unit tests for target
@@ -55,6 +56,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbluetooth_gd",
+ "libbt_shim_bridge",
"libbtcore",
"libbtdevice",
"libchrome",
@@ -90,6 +92,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtcore",
"libbtdevice",
"libchrome",
diff --git a/system/device/fuzzer/Android.bp b/system/device/fuzzer/Android.bp
index 1f5193d948..0112ef8805 100644
--- a/system/device/fuzzer/Android.bp
+++ b/system/device/fuzzer/Android.bp
@@ -36,6 +36,7 @@ cc_fuzz {
static_libs: [
"libbluetooth-types",
"libbluetooth_gd",
+ "libbt_shim_bridge",
"libbtcore",
"libbtdevice",
"libchrome",
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 08b49ca15d..d693301f0d 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -37,6 +37,7 @@ cc_library_static {
host_supported: true,
min_sdk_version: "Tiramisu",
header_libs: ["libbluetooth_headers"],
+ static_libs: ["libbt_shim_bridge"],
}
// HCI unit tests for target
diff --git a/system/main/Android.bp b/system/main/Android.bp
index eed529f320..f1defb5920 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -58,6 +58,7 @@ cc_library_static {
static_libs: [
"libbluetooth_gd",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
],
header_libs: ["libbluetooth_headers"],
}
@@ -152,7 +153,10 @@ cc_library_static {
"libbluetooth_gd", // Gabeldorsche
],
header_libs: ["libbluetooth_headers"],
- static_libs: ["libbt-platform-protos-lite"],
+ static_libs: [
+ "libbt-platform-protos-lite",
+ "libbt_shim_bridge",
+ ],
}
cc_test {
@@ -212,6 +216,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtdevice",
"libchrome",
"libevent",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 2cd2bf2cfa..da06228b92 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -88,7 +88,10 @@ cc_library_static {
"com.android.btservices",
],
header_libs: ["libbluetooth_headers"],
- static_libs: ["libbt-platform-protos-lite"],
+ static_libs: [
+ "libbt-platform-protos-lite",
+ "libbt_shim_bridge",
+ ],
}
// libosi unit tests for target and host
@@ -131,6 +134,7 @@ cc_test {
static_libs: [
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libc++fs",
"libchrome",
"libevent",
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index ef2aef08d7..f30f016c81 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -27,6 +27,7 @@ cc_library_static {
static_libs: [
"lib-bt-packets",
"libbluetooth-types",
+ "libbt_shim_bridge",
"libosi",
],
whole_static_libs: [
@@ -72,6 +73,7 @@ cc_test {
"libbase",
"libbluetooth-types",
"libbluetooth_gd",
+ "libbt_shim_bridge",
"libbtdevice",
"libchrome",
"libcutils",
@@ -112,6 +114,7 @@ cc_fuzz {
"libbase",
"libbluetooth-types",
"libbluetooth_gd",
+ "libbt_shim_bridge",
"libchrome",
"libcutils",
"libevent",
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index ee06f0b3fa..66e1084b6f 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -139,6 +139,7 @@ cc_library_static {
"libbt-hci",
"libbt-platform-protos-lite",
"libbt-stack-core",
+ "libbt_shim_bridge",
],
whole_static_libs: [
"libaptx_enc",
@@ -291,6 +292,7 @@ cc_library_static {
"libbluetooth_gd",
"libbt-hci",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
],
shared_libs: [
"libPlatformProperties",
@@ -397,6 +399,7 @@ cc_fuzz {
static_libs: [
"libbluetooth-types",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
],
}
@@ -440,6 +443,7 @@ cc_fuzz {
static_libs: [
"libbluetooth-types",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libgmock",
],
}
@@ -479,6 +483,7 @@ cc_fuzz {
static_libs: [
"libbluetooth-types",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libgmock",
],
}
@@ -518,6 +523,7 @@ cc_fuzz {
static_libs: [
"libbluetooth-types",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libgmock",
],
}
@@ -559,6 +565,7 @@ cc_fuzz {
static_libs: [
"libbluetooth-types",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libgmock",
"libosi",
],
@@ -605,6 +612,7 @@ cc_fuzz {
static_libs: [
"libbluetooth-types",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libgmock",
],
target: {
@@ -677,6 +685,7 @@ cc_test {
"libbt-sbc-encoder",
"libbt-stack",
"libbt-stack-core",
+ "libbt_shim_bridge",
"libbtcore",
"libbtdevice",
"libbtif",
@@ -756,6 +765,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libgmock",
@@ -836,6 +846,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libgmock",
@@ -905,6 +916,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libgmock",
@@ -956,6 +968,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libgmock",
@@ -1023,6 +1036,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"liblog",
@@ -1134,6 +1148,7 @@ cc_test {
"libbt-common",
"libbt-sbc-decoder",
"libbt-sbc-encoder",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
"liblog",
@@ -1183,6 +1198,7 @@ cc_test {
],
static_libs: [
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"liblog",
"libosi",
@@ -1241,6 +1257,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libgmock",
@@ -1289,6 +1306,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
"liblog",
@@ -1353,6 +1371,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
"libgmock",
@@ -1473,6 +1492,7 @@ cc_test {
"libbt-platform-protos-lite",
"libbt-sbc-decoder",
"libbt-sbc-encoder",
+ "libbt_shim_bridge",
"libbtdevice",
"libchrome",
"libevent",
@@ -1522,6 +1542,7 @@ cc_test {
],
static_libs: [
"libbt-common",
+ "libbt_shim_bridge",
"libbtdevice",
"libbte",
"libchrome",
@@ -1580,6 +1601,7 @@ cc_test {
"libbluetooth-types",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtdevice",
"libbte",
"libchrome",
@@ -1655,6 +1677,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtdevice",
"libchrome",
"libevent",
@@ -1739,6 +1762,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtdevice",
"libchrome",
"libevent",
@@ -1824,6 +1848,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtdevice",
"libchrome",
"libevent",
@@ -1913,6 +1938,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libbtdevice",
"libchrome",
"libevent",
@@ -1984,6 +2010,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libgmock",
"liblog",
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index 426c8e46c9..02c199d30e 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/Android.bp
@@ -34,6 +34,7 @@ cc_defaults {
"libbt-sbc-encoder",
"libbt-stack",
"libbt-stack-core",
+ "libbt_shim_bridge",
"libbtcore",
"libbtdevice",
"libbte",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index e82edf866e..c4d6195b83 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -125,6 +125,7 @@ cc_test {
"android.media.audio.common.types-V2-ndk",
"libbluetooth_gd",
"libbt-platform-protos-lite",
+ "libbt_shim_bridge",
"libchrome",
"libevent",
],
diff --git a/system/udrv/Android.bp b/system/udrv/Android.bp
index 8564781647..2f89f47296 100644
--- a/system/udrv/Android.bp
+++ b/system/udrv/Android.bp
@@ -29,4 +29,5 @@ cc_library_static {
],
min_sdk_version: "Tiramisu",
header_libs: ["libbluetooth_headers"],
+ static_libs: ["libbt_shim_bridge"],
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-21 18:39:30 +0000