diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 90383164923709ebc8ea8c370d5e3164301a033f..671c88b913eaf5029cda7c88dffca814c47d4527 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -132,6 +132,7 @@ cc_library_static {
"lib-bt-packets",
"libbluetooth_gd",
"libbt-bta-core",
+ "libbt-platform-protos-lite",
"libcom.android.sysprop.bluetooth",
],
shared_libs: [
@@ -190,6 +191,7 @@ cc_library_static {
],
static_libs: [
"lib-bt-packets",
+ "libbt-platform-protos-lite",
"libcom.android.sysprop.bluetooth",
],
apex_available: [
@@ -244,6 +246,7 @@ cc_test {
"libbt-bta",
"libbt-bta-core",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtcore",
"libchrome",
"libcom.android.sysprop.bluetooth",
@@ -290,6 +293,7 @@ cc_test {
"libbt-bta",
"libbt-bta-core",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtcore",
"libchrome",
"libosi",
@@ -406,6 +410,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtcore",
"libbtdevice",
"libchrome",
@@ -569,6 +574,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libchrome",
"libgmock",
"libosi",
@@ -883,6 +889,7 @@ cc_test {
"libbluetooth_gd",
"libbt-audio-hal-interface",
"libbt-common",
+ "libbt-platform-protos-lite",
"libchrome",
"libevent",
"libflatbuffers-cpp",
@@ -1189,6 +1196,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libchrome",
"libcom.android.sysprop.bluetooth",
"libevent",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index a46b91b5063efe834af1f236627015b969c3f3d5..7ef85e905cdd419d723d7534a6b368b8302e1b5a 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -150,6 +150,7 @@ cc_library_static {
"libaudio-a2dp-hw-utils",
"libbluetooth-types",
"libbt-audio-hal-interface",
+ "libbt-platform-protos-lite",
"libbt-stack",
"libbt-stack-core",
"libbtif-core",
@@ -227,6 +228,7 @@ cc_library_static {
"lib-bt-packets-base",
"libaudio-a2dp-hw-utils",
"libbt-audio-hal-interface",
+ "libbt-platform-protos-lite",
"libbt-stack-core",
"libstatslog_bt",
],
@@ -418,6 +420,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libchrome",
"libevent",
],
@@ -599,6 +602,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-audio-hal-interface",
+ "libbt-platform-protos-lite",
"libbt-sbc-decoder",
"libbt-sbc-encoder",
"libbt-stack",
@@ -733,6 +737,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-audio-hal-interface",
+ "libbt-platform-protos-lite",
"libbt-sbc-decoder",
"libbt-sbc-encoder",
"libbtdevice",
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 6a40a16f6dedc0c4813f70fc0550f7c3be94a5cc..9ea1dfd4df5e50647258cd97aee9f4a82a118515 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-platform-protos-lite",
"libbt_shim_bridge",
"libbt_shim_ffi",
],
diff --git a/system/common/Android.bp b/system/common/Android.bp
index 9cd44cadf9fe4de92f635004aba5fd0ec1c2b294..ff3a487f9809a7500edf147b6d95dcedab73e5bc 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -53,6 +53,7 @@ cc_library_static {
],
min_sdk_version: "Tiramisu",
header_libs: ["libbluetooth_headers"],
+ static_libs: ["libbt-platform-protos-lite"],
}
cc_test {
@@ -97,6 +98,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbt-common",
+ "libbt-platform-protos-lite",
"libchrome",
"libevent",
"libgmock",
diff --git a/system/device/Android.bp b/system/device/Android.bp
index ce586719d69c17f4cbadbfe6c27518eca7a08e7b..e6acea27b341b54780456ebe3c55e6b8bec519d4 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -89,6 +89,7 @@ cc_test {
],
static_libs: [
"libbluetooth-types",
+ "libbt-platform-protos-lite",
"libbtcore",
"libbtdevice",
"libchrome",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index aca76270c2a56ddc5c03e156c7ea69cbf2fa55f3..eed529f320736cada5ee830fa5c7d53f9c9594eb 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -55,7 +55,10 @@ cc_library_static {
],
host_supported: true,
min_sdk_version: "Tiramisu",
- static_libs: ["libbluetooth_gd"],
+ static_libs: [
+ "libbluetooth_gd",
+ "libbt-platform-protos-lite",
+ ],
header_libs: ["libbluetooth_headers"],
}
@@ -149,6 +152,7 @@ cc_library_static {
"libbluetooth_gd", // Gabeldorsche
],
header_libs: ["libbluetooth_headers"],
+ static_libs: ["libbt-platform-protos-lite"],
}
cc_test {
@@ -207,6 +211,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtdevice",
"libchrome",
"libevent",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 197a840637153dc07915fb8c5c014d1ec62a6f3f..2cd2bf2cfa312c4a390c7c3b43fd1ad5bd451f73 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -88,6 +88,7 @@ cc_library_static {
"com.android.btservices",
],
header_libs: ["libbluetooth_headers"],
+ static_libs: ["libbt-platform-protos-lite"],
}
// libosi unit tests for target and host
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 5553fc7e99267537db49854129d9bf06089c204f..ee06f0b3faa444bf4caaea73bf88dbe461bf06b1 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -137,6 +137,7 @@ cc_library_static {
],
static_libs: [
"libbt-hci",
+ "libbt-platform-protos-lite",
"libbt-stack-core",
],
whole_static_libs: [
@@ -289,6 +290,7 @@ cc_library_static {
"libbluetooth_core_rs",
"libbluetooth_gd",
"libbt-hci",
+ "libbt-platform-protos-lite",
],
shared_libs: [
"libPlatformProperties",
@@ -392,7 +394,10 @@ cc_fuzz {
":TestMockStackMetrics",
"fuzzers/sdp_fuzzer.cc",
],
- static_libs: ["libbluetooth-types"],
+ static_libs: [
+ "libbluetooth-types",
+ "libbt-platform-protos-lite",
+ ],
}
cc_fuzz {
@@ -434,6 +439,7 @@ cc_fuzz {
],
static_libs: [
"libbluetooth-types",
+ "libbt-platform-protos-lite",
"libgmock",
],
}
@@ -472,6 +478,7 @@ cc_fuzz {
],
static_libs: [
"libbluetooth-types",
+ "libbt-platform-protos-lite",
"libgmock",
],
}
@@ -510,6 +517,7 @@ cc_fuzz {
],
static_libs: [
"libbluetooth-types",
+ "libbt-platform-protos-lite",
"libgmock",
],
}
@@ -550,6 +558,7 @@ cc_fuzz {
],
static_libs: [
"libbluetooth-types",
+ "libbt-platform-protos-lite",
"libgmock",
"libosi",
],
@@ -595,6 +604,7 @@ cc_fuzz {
],
static_libs: [
"libbluetooth-types",
+ "libbt-platform-protos-lite",
"libgmock",
],
target: {
@@ -745,6 +755,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libchrome",
"libevent",
"libgmock",
@@ -824,6 +835,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbluetooth_gd",
+ "libbt-platform-protos-lite",
"libchrome",
"libevent",
"libgmock",
@@ -1228,6 +1240,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libchrome",
"libevent",
"libgmock",
@@ -1457,6 +1470,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbt-sbc-decoder",
"libbt-sbc-encoder",
"libbtdevice",
@@ -1565,6 +1579,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtdevice",
"libbte",
"libchrome",
@@ -1639,6 +1654,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtdevice",
"libchrome",
"libevent",
@@ -1722,6 +1738,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtdevice",
"libchrome",
"libevent",
@@ -1806,6 +1823,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtdevice",
"libchrome",
"libevent",
@@ -1894,6 +1912,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libbtdevice",
"libchrome",
"libevent",
@@ -1964,6 +1983,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt-common",
+ "libbt-platform-protos-lite",
"libchrome",
"libgmock",
"liblog",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 8c7361fe431b06a43ebfb735f1fe3a29bfecf596..e82edf866ead5b11f19fbcc5745db101879cbe4b 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -124,6 +124,7 @@ cc_test {
"android.hardware.common.fmq-V1-ndk",
"android.media.audio.common.types-V2-ndk",
"libbluetooth_gd",
+ "libbt-platform-protos-lite",
"libchrome",
"libevent",
],