diff options
-rw-r--r-- | system/bta/Android.bp | 8 | ||||
-rw-r--r-- | system/btif/Android.bp | 5 | ||||
-rw-r--r-- | system/build/Android.bp | 1 | ||||
-rw-r--r-- | system/common/Android.bp | 2 | ||||
-rw-r--r-- | system/device/Android.bp | 1 | ||||
-rw-r--r-- | system/main/Android.bp | 7 | ||||
-rw-r--r-- | system/osi/Android.bp | 1 | ||||
-rw-r--r-- | system/stack/Android.bp | 22 | ||||
-rw-r--r-- | system/test/suite/Android.bp | 1 |
9 files changed, 45 insertions, 3 deletions
diff --git a/system/bta/Android.bp b/system/bta/Android.bp index 9038316492..671c88b913 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 a46b91b506..7ef85e905c 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 6a40a16f6d..9ea1dfd4df 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 9cd44cadf9..ff3a487f98 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 ce586719d6..e6acea27b3 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 aca76270c2..eed529f320 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 197a840637..2cd2bf2cfa 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 5553fc7e99..ee06f0b3fa 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 8c7361fe43..e82edf866e 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", ], |