diff --git a/android/app/Android.bp b/android/app/Android.bp
index 8d683275a0f33d877c23b0f61d031aefc912df8f..b3b05ce24a471c8fc6186719709e26c3aa33d21d 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -72,6 +72,9 @@ cc_library_shared {
"libbluetooth_core_rs",
"libbluetooth_core_rs_bridge",
"libc++fs",
+ "libchrome",
+ "libevent",
+ "libmodpb64",
],
shared_libs: [
"android.hardware.bluetooth@1.0",
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index 183276495de13e6faf018f852256cf7b52105d61..994db05fd69076ad22ba14e8e65d468ca6873ac5 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -99,6 +99,7 @@ cc_test {
static_libs: [
"libbt-audio-hal-interface",
"libbt-common",
+ "libchrome",
],
cflags: [
"-DBUILDCFG",
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 12339cb8f58abba5542d27afc59f5b9c963d98a1..c541f64fc776d455d74de4bf98c98ee924a3e621 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -226,6 +226,7 @@ cc_test {
"libbt-common",
"libbt-protos-lite",
"libbtcore",
+ "libchrome",
"libcom.android.sysprop.bluetooth",
"libosi",
],
@@ -269,6 +270,7 @@ cc_test {
"libbt-common",
"libbt-protos-lite",
"libbtcore",
+ "libchrome",
"libosi",
],
}
@@ -352,7 +354,9 @@ cc_test {
"libbt-protos-lite",
"libbtcore",
"libbtdevice",
+ "libchrome",
"libcom.android.sysprop.bluetooth",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
],
@@ -403,6 +407,7 @@ cc_test {
"crypto_toolbox_for_tests",
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
"libgmock",
"libosi",
],
@@ -446,6 +451,7 @@ cc_test {
"crypto_toolbox_for_tests",
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
"libgmock",
"libosi",
],
@@ -500,6 +506,7 @@ cc_test {
"crypto_toolbox_for_tests",
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
"libgmock",
"libosi",
],
@@ -666,6 +673,8 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"libosi",
@@ -736,6 +745,8 @@ cc_test {
"libbt-audio-hal-interface",
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblc3",
@@ -810,6 +821,7 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
"libgmock",
"liblc3",
],
@@ -873,6 +885,8 @@ cc_test {
"libbt-audio-hal-interface",
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libgmock",
"liblc3",
"libosi",
@@ -940,6 +954,7 @@ cc_test {
"crypto_toolbox_for_tests",
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
"libgmock",
],
sanitize: {
@@ -1005,9 +1020,11 @@ cc_test {
"crypto_toolbox_for_tests",
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
"libcom.android.sysprop.bluetooth",
+ "libevent",
"libgmock",
- "libosi", // ADDED
+ "libosi",
],
generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h",
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index d34a731402ba0006dbc8653d5a52f23ec0c4998e..b3b7d45dbcebe2906d5e50efe29a8fe32a814fcc 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -102,6 +102,7 @@ cc_test {
],
static_libs: [
"libbtcore",
+ "libchrome",
"libosi",
"libosi-AllocationTestHarness",
],
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 32550b1ff33860d6273270e62e7945cdbeeee8e6..fb37c64289eebcf039827d3c84473af66b27da3b 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -280,6 +280,7 @@ cc_test {
"libbtdevice",
"libbtif",
"libbtif-core",
+ "libchrome",
"libg722codec",
"liblc3",
"libopus",
@@ -327,6 +328,7 @@ cc_test {
],
static_libs: [
"libbluetooth-types",
+ "libchrome",
"libflatbuffers-cpp",
"libosi",
],
@@ -361,6 +363,8 @@ cc_test {
"libbluetooth-types",
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libosi",
"libosi-AllocationTestHarness",
],
@@ -400,6 +404,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libc++fs",
+ "libchrome",
"libgmock",
"libosi",
],
@@ -434,6 +439,7 @@ cc_test {
],
static_libs: [
"libbluetooth-types",
+ "libchrome",
"libcom.android.sysprop.bluetooth",
"libosi",
],
@@ -543,7 +549,9 @@ cc_test {
"libbtif",
"libbtif-core",
"libc++fs",
+ "libchrome",
"libcom.android.sysprop.bluetooth",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
],
@@ -666,7 +674,9 @@ cc_test {
"libbtif",
"libbtif-core",
"libc++fs",
+ "libchrome",
"libcom.android.sysprop.bluetooth",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
],
diff --git a/system/build/Android.bp b/system/build/Android.bp
index bcdedcb1b649c0bf9378673be0b9c9ed88706021..87da24d6019226168c73c6529fc6a11b6914d81f 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -94,7 +94,6 @@ cc_defaults {
name: "fluoride_types_defaults",
defaults: [
"fluoride_types_defaults_fuzzable",
- "libchrome_support_defaults",
],
}
@@ -172,7 +171,6 @@ cc_defaults {
name: "fluoride_basic_defaults",
defaults: [
"fluoride_test_prod_shared_defaults",
- "libchrome_support_defaults",
],
apex_available: [
"//apex_available:platform",
diff --git a/system/common/Android.bp b/system/common/Android.bp
index 974349311edd3775d9748bcae954e2618e645129..44e2e52abe30b4623a48e17f0968667cf1e4015a 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -84,6 +84,8 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libgmock",
"libprotobuf-cpp-lite",
],
@@ -110,6 +112,8 @@ cc_test {
],
static_libs: [
"libbt-common",
+ "libchrome",
+ "libevent",
"libgmock",
"libosi",
],
@@ -131,6 +135,8 @@ cc_benchmark {
],
static_libs: [
"libbt-common",
+ "libchrome",
+ "libevent",
"libosi",
],
}
@@ -155,6 +161,8 @@ cc_benchmark {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libosi",
],
}
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 13a935a4ec52019bb315d3901e5ad403aaa5c994..5ab4a2cbc0ba7701a68b468b2300ca7a5cc30eb1 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -52,6 +52,7 @@ cc_test {
"libbluetooth-types",
"libbtcore",
"libbtdevice",
+ "libchrome",
"libosi",
"libosi-AllocationTestHarness",
],
@@ -84,6 +85,7 @@ cc_test {
"libbluetooth-types",
"libbtcore",
"libbtdevice",
+ "libchrome",
"libgmock",
"libosi-AllocationTestHarness",
],
diff --git a/system/device/fuzzer/Android.bp b/system/device/fuzzer/Android.bp
index 226c36c65411ad69ceb8633c23e2e08825acb84d..72c4aadf9f2e7715c51a14a7b5491275a7ac1314 100644
--- a/system/device/fuzzer/Android.bp
+++ b/system/device/fuzzer/Android.bp
@@ -37,6 +37,7 @@ cc_fuzz {
"libbluetooth-types",
"libbtcore",
"libbtdevice",
+ "libchrome",
"libosi",
],
include_dirs: [
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index c21438fd64f21683f078a731081ae34f4883754f..f39df623efe238ad6e7a59cc8a72569dee52ae61 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -91,11 +91,16 @@ cc_test {
"libbluetooth-for-tests",
"libbt-hci",
"libbtcore",
+ "libchrome",
],
}
cc_test {
name: "net_test_hci_fragmenter_native",
+ static_libs: [
+ "libbase",
+ "libchrome",
+ ],
test_suites: ["device-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 647b43bce5364107977f55af0f32b0d2458cbf05..46e1150125935d9a3372a167619c271731692b2a 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -199,6 +199,8 @@ cc_test {
"libbt-common",
"libbt-protos-lite",
"libbtdevice",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblog",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 524323d53eadc47f8791d8cf330ff92f91215004..ed694f3a8cf1818cbc8361959bf11b1dd2a6d8ff 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -163,6 +163,8 @@ cc_test {
"libbt-common",
"libbt-protos-lite",
"libc++fs",
+ "libchrome",
+ "libevent",
"libgmock",
"libosi",
"libprotobuf-cpp-lite",
diff --git a/system/osi/test/fuzzers/alarm/Android.bp b/system/osi/test/fuzzers/alarm/Android.bp
index bd156193ad9e176b4dba2f1a0214b5b95da67bba..15a4710fe9bf215e7887ea6272159270c54b99be 100644
--- a/system/osi/test/fuzzers/alarm/Android.bp
+++ b/system/osi/test/fuzzers/alarm/Android.bp
@@ -23,6 +23,7 @@ cc_fuzz {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
"libgmock",
"libosi",
],
diff --git a/system/osi/test/fuzzers/allocation_tracker/Android.bp b/system/osi/test/fuzzers/allocation_tracker/Android.bp
index c07af5520707ccd794ab17364ab6a37ffc2dd732..3e36a071924610836715da643efac57fc1437155 100644
--- a/system/osi/test/fuzzers/allocation_tracker/Android.bp
+++ b/system/osi/test/fuzzers/allocation_tracker/Android.bp
@@ -18,6 +18,7 @@ cc_fuzz {
"liblog",
],
static_libs: [
+ "libchrome",
"libosi",
],
corpus: [
diff --git a/system/osi/test/fuzzers/allocator/Android.bp b/system/osi/test/fuzzers/allocator/Android.bp
index 60a221e856f3bbb0b711598fc3f8fe1f91281a14..4b2541f4a5b871bb5c1cacbc74dc25176a00ca23 100644
--- a/system/osi/test/fuzzers/allocator/Android.bp
+++ b/system/osi/test/fuzzers/allocator/Android.bp
@@ -15,6 +15,7 @@ cc_fuzz {
"fuzz_allocator.cc",
],
static_libs: [
+ "libchrome",
"liblog",
"libosi",
],
diff --git a/system/osi/test/fuzzers/array/Android.bp b/system/osi/test/fuzzers/array/Android.bp
index 733a3afd466e8d2aae6bc2924cfd4ff1708fbf68..97cbacbc812672390e411272b600c6d905900a46 100644
--- a/system/osi/test/fuzzers/array/Android.bp
+++ b/system/osi/test/fuzzers/array/Android.bp
@@ -18,6 +18,7 @@ cc_fuzz {
"liblog",
],
static_libs: [
+ "libchrome",
"libosi",
],
}
diff --git a/system/osi/test/fuzzers/buffer/Android.bp b/system/osi/test/fuzzers/buffer/Android.bp
index 940b07a4e9434267bf690c333b8bbbc174391b45..568fa42a5d4d11550b71ff9572d01bec4c4408cb 100644
--- a/system/osi/test/fuzzers/buffer/Android.bp
+++ b/system/osi/test/fuzzers/buffer/Android.bp
@@ -18,6 +18,7 @@ cc_fuzz {
"liblog",
],
static_libs: [
+ "libchrome",
"libosi",
],
}
diff --git a/system/osi/test/fuzzers/fixed_queue/Android.bp b/system/osi/test/fuzzers/fixed_queue/Android.bp
index 987a7aa898c61baba62b9418fb7297bb28291421..60846b017bc83c294f12021c56e422b766bde99e 100644
--- a/system/osi/test/fuzzers/fixed_queue/Android.bp
+++ b/system/osi/test/fuzzers/fixed_queue/Android.bp
@@ -19,6 +19,7 @@ cc_fuzz {
"liblog",
],
static_libs: [
+ "libchrome",
"libosi",
],
}
diff --git a/system/osi/test/fuzzers/future/Android.bp b/system/osi/test/fuzzers/future/Android.bp
index 40bec647ed4ef46acc9909f78a004da829c840c9..46cb4aaceedac124542f40c976cf7d66ac7a8f51 100644
--- a/system/osi/test/fuzzers/future/Android.bp
+++ b/system/osi/test/fuzzers/future/Android.bp
@@ -19,6 +19,7 @@ cc_fuzz {
"liblog",
],
static_libs: [
+ "libchrome",
"libosi",
],
}
diff --git a/system/osi/test/fuzzers/list/Android.bp b/system/osi/test/fuzzers/list/Android.bp
index e80e2dc9a1926a084d06eb273fea033b6a79b9a2..b3b46449393dbbb40f0601445a69b76cd0ca60c2 100644
--- a/system/osi/test/fuzzers/list/Android.bp
+++ b/system/osi/test/fuzzers/list/Android.bp
@@ -15,6 +15,7 @@ cc_fuzz {
"fuzz_list.cc",
],
static_libs: [
+ "libchrome",
"liblog",
"libosi",
],
diff --git a/system/osi/test/fuzzers/ringbuffer/Android.bp b/system/osi/test/fuzzers/ringbuffer/Android.bp
index 6fb3982e239500c7a2cdfca1b4c544bee837f03d..beed8d10e5f3d4c280983b39b3fb9ad2d93525d4 100644
--- a/system/osi/test/fuzzers/ringbuffer/Android.bp
+++ b/system/osi/test/fuzzers/ringbuffer/Android.bp
@@ -15,6 +15,7 @@ cc_fuzz {
"fuzz_ringbuffer.cc",
],
static_libs: [
+ "libchrome",
"liblog",
"libosi",
],
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index f7f6fa2fe0afcb6c1768122d62da9aacd0023841..26c69424fa80ecd50b7cb4b0e412e7001f19d416 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -78,6 +78,7 @@ cc_test {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
diff --git a/system/packet/tests/fuzzers/Android.bp b/system/packet/tests/fuzzers/Android.bp
index 2689078fd167deadcc2c201d4bb48180ac503efc..ef196019eb1a37835d5b02b4d0e43b401d321cf9 100644
--- a/system/packet/tests/fuzzers/Android.bp
+++ b/system/packet/tests/fuzzers/Android.bp
@@ -31,6 +31,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -63,6 +64,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -95,6 +97,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -127,6 +130,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -159,6 +163,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -191,6 +196,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -223,6 +229,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -255,6 +262,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -287,6 +295,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -319,6 +328,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -351,6 +361,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -383,6 +394,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -415,6 +427,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -447,6 +460,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -479,6 +493,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -511,6 +526,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -543,6 +559,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -575,6 +592,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -607,6 +625,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -639,6 +658,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -671,6 +691,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -703,6 +724,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -735,6 +757,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -767,6 +790,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
@@ -799,6 +823,7 @@ cc_fuzz {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
+ "libchrome",
"libgmock",
],
cflags: [
diff --git a/system/profile/sdp/Android.bp b/system/profile/sdp/Android.bp
index abd5f91f56d1a4894c9938f827c1efcce9e75deb..dc1f541e0b9a3b95f087dc0a1713322f867df4f0 100644
--- a/system/profile/sdp/Android.bp
+++ b/system/profile/sdp/Android.bp
@@ -47,6 +47,7 @@ cc_test {
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
"libbluetooth-types",
+ "libchrome",
"libgmock",
"sdp_service",
],
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 3655f8a69c813879b461e16504db0075f24430fa..faf2c6c4a32a26645e320622715c2d1e785b532f 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -16,6 +16,7 @@ crypto_toolbox_srcs = [
cc_test_library {
name: "crypto_toolbox_for_tests",
+ static_libs: ["libchrome"],
defaults: ["fluoride_defaults"],
host_supported: true,
include_dirs: [
@@ -349,6 +350,7 @@ cc_test {
"libbtdevice",
"libbtif",
"libbtif-core",
+ "libchrome",
"libg722codec",
"liblc3",
"libopus",
@@ -419,6 +421,8 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblog",
@@ -486,6 +490,8 @@ cc_test {
"libcutils",
],
static_libs: [
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblog",
@@ -525,6 +531,7 @@ cc_test {
static_libs: [
"android.system.suspend.control-V1-ndk",
"libbluetooth-types",
+ "libchrome",
"libgmock",
"liblog",
],
@@ -592,6 +599,8 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbt-common",
+ "libchrome",
+ "libevent",
"libgmock",
"liblog",
],
@@ -639,6 +648,8 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libgmock",
"liblog",
"libosi",
@@ -695,6 +706,8 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"liblog",
"libosi",
"libosi-AllocationTestHarness",
@@ -794,6 +807,7 @@ cc_test {
"libbt-protos-lite",
"libbt-sbc-decoder",
"libbt-sbc-encoder",
+ "libchrome",
"libgmock",
"liblog",
"libopus",
@@ -843,6 +857,7 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
"liblog",
"libosi",
"libosi-AllocationTestHarness",
@@ -892,6 +907,8 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libgmock",
"liblog",
"libosi",
@@ -930,6 +947,7 @@ cc_test {
],
static_libs: [
"libbt-common",
+ "libchrome",
"libgmock",
"liblog",
"libosi",
@@ -992,6 +1010,8 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libchrome",
+ "libevent",
"libgmock",
"liblog",
"libosi",
@@ -1094,6 +1114,8 @@ cc_test {
"libbt-sbc-decoder",
"libbt-sbc-encoder",
"libbtdevice",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblog",
@@ -1144,6 +1166,7 @@ cc_test {
"libbt-protos-lite",
"libbtdevice",
"libbte",
+ "libchrome",
"libgmock",
"liblog",
"libosi",
@@ -1199,6 +1222,8 @@ cc_test {
"libbt-protos-lite",
"libbtdevice",
"libbte",
+ "libchrome",
+ "libevent",
"libgmock",
"liblog",
"libosi",
@@ -1263,6 +1288,8 @@ cc_test {
"libbt-common",
"libbt-protos-lite",
"libbtdevice",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblog",
@@ -1343,6 +1370,8 @@ cc_test {
"libbt-common",
"libbt-protos-lite",
"libbtdevice",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblog",
@@ -1417,6 +1446,8 @@ cc_test {
"libbt-common",
"libbt-protos-lite",
"libbtdevice",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblog",
@@ -1499,6 +1530,8 @@ cc_test {
"libbt-common",
"libbt-protos-lite",
"libbtdevice",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libgmock",
"liblog",
@@ -1559,6 +1592,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbt-common",
+ "libchrome",
"libgmock",
"liblog",
],
diff --git a/system/stack/test/fuzzers/a2dp/Android.bp b/system/stack/test/fuzzers/a2dp/Android.bp
index b39a8022af157b27c1498cdc81d9c8e0246c12a0..65b56b4895e1b80e3ad6ea866691faee2a4ffc0a 100644
--- a/system/stack/test/fuzzers/a2dp/Android.bp
+++ b/system/stack/test/fuzzers/a2dp/Android.bp
@@ -9,6 +9,7 @@ package {
cc_fuzz {
name: "a2dp_fuzz",
+ static_libs: ["libchrome"],
defaults: ["libbt-stack_fuzz_defaults"],
srcs: [
"fuzz_a2dp.cc",
diff --git a/system/stack/test/fuzzers/a2dp/codec/Android.bp b/system/stack/test/fuzzers/a2dp/codec/Android.bp
index 79fa89e423dd5c859bdd2b51cd240c72dc60633c..7c7825db3dab5cce052952a8abdc874c9fb2d7b2 100644
--- a/system/stack/test/fuzzers/a2dp/codec/Android.bp
+++ b/system/stack/test/fuzzers/a2dp/codec/Android.bp
@@ -19,6 +19,7 @@ cc_defaults {
cc_fuzz {
name: "a2dp_codec_fuzz",
+ static_libs: ["libchrome"],
defaults: ["libbt-stack_fuzz_codec_defaults"],
srcs: [
"fuzz_a2dp_codec.cc",
@@ -27,6 +28,7 @@ cc_fuzz {
cc_fuzz {
name: "a2dp_codec_info_fuzz",
+ static_libs: ["libchrome"],
defaults: ["libbt-stack_fuzz_codec_defaults"],
srcs: [
"fuzz_a2dp_codec_info.cc",
@@ -35,6 +37,7 @@ cc_fuzz {
cc_fuzz {
name: "a2dp_codec_cfg_fuzz",
+ static_libs: ["libchrome"],
defaults: ["libbt-stack_fuzz_codec_defaults"],
srcs: [
"fuzz_a2dp_codec_config.cc",
diff --git a/system/stack/test/fuzzers/sdp/Android.bp b/system/stack/test/fuzzers/sdp/Android.bp
index 79b5c393a6b3085f763549acc4f4ac978dfb697b..bc5aaa702b0eec8a8c191732f3e49c1da64a59e2 100644
--- a/system/stack/test/fuzzers/sdp/Android.bp
+++ b/system/stack/test/fuzzers/sdp/Android.bp
@@ -9,6 +9,7 @@ package {
cc_fuzz {
name: "sdp_fuzz",
+ static_libs: ["libchrome"],
defaults: ["libbt-stack_fuzz_defaults"],
srcs: [
"fuzz_sdp.cc",
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index c9c41c66d92afda7091123dc8e1ca91ba7f6d120..2b7f7ac3839d67b6ebdbfcdc7565437cb77c4ff8 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -105,9 +105,12 @@ cc_binary {
"libbtif",
"libbtif-core",
"libc++fs",
+ "libchrome",
+ "libevent",
"libflatbuffers-cpp",
"libg722codec",
"liblc3",
+ "libmodpb64",
"libopus",
"libosi",
"libprotobuf-cpp-lite",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index e109ef9aa386b8eb0479b78df9c3cc47cecaabf3..06476a659b26aaf8f19b022fd8c864cc00047d47 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -128,5 +128,7 @@ cc_test {
static_libs: [
"android.hardware.bluetooth@1.0",
"android.hardware.bluetooth@1.1",
+ "libchrome",
+ "libevent",
],
}
diff --git a/system/types/Android.bp b/system/types/Android.bp
index 2894aab55e821a27a7baa4127393c974d0e33bd6..c9d52b2c245772d071d179a623e0107fe8835b93 100644
--- a/system/types/Android.bp
+++ b/system/types/Android.bp
@@ -46,6 +46,7 @@ cc_library_static {
"class_of_device.cc",
"raw_address.cc",
],
+ static_libs: ["libchrome"],
header_libs: ["libbluetooth-types-header"],
export_header_lib_headers: ["libbluetooth-types-header"],
apex_available: [
@@ -57,6 +58,7 @@ cc_library_static {
cc_test {
name: "net_test_types",
+ static_libs: ["libchrome"],
test_suites: ["device-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",