summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/audio/Android.bp2
-rw-r--r--system/audio_hal_interface/Android.bp1
-rw-r--r--system/audio_hal_interface/fuzzer/Android.bp1
-rw-r--r--system/bta/Android.bp11
-rw-r--r--system/btif/Android.bp3
-rw-r--r--system/build/Android.bp4
-rw-r--r--system/device/Android.bp2
-rw-r--r--system/device/fuzzer/Android.bp1
-rw-r--r--system/gd/Android.bp5
-rw-r--r--system/gd/rust/topshim/facade/Android.bp1
-rw-r--r--system/main/Android.bp2
-rw-r--r--system/osi/Android.bp2
-rw-r--r--system/profile/avrcp/Android.bp1
-rw-r--r--system/stack/Android.bp15
-rw-r--r--system/stack/test/fuzzers/Android.bp1
-rw-r--r--system/test/headless/Android.bp1
-rw-r--r--system/test/suite/Android.bp1
17 files changed, 53 insertions, 1 deletions
diff --git a/system/audio/Android.bp b/system/audio/Android.bp
index 0e957a4a28..9165555cf6 100644
--- a/system/audio/Android.bp
+++ b/system/audio/Android.bp
@@ -27,6 +27,7 @@ cc_library_static {
"libbluetooth_headers",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libchrome",
"liblog",
"server_configurable_flags",
@@ -67,6 +68,7 @@ cc_library_host_shared {
"libbluetooth_headers",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"server_configurable_flags",
],
static_libs: [
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index 408e4656e6..bafbdfab47 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -166,6 +166,7 @@ cc_test {
"aidl/a2dp_provider_info_unittest.cc",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbinder_ndk",
"libcutils",
"libhidlbase",
diff --git a/system/audio_hal_interface/fuzzer/Android.bp b/system/audio_hal_interface/fuzzer/Android.bp
index 15df156d2c..8bdf7f8dd8 100644
--- a/system/audio_hal_interface/fuzzer/Android.bp
+++ b/system/audio_hal_interface/fuzzer/Android.bp
@@ -37,6 +37,7 @@ cc_defaults {
shared_libs: [
"libPlatformProperties",
"libaaudio",
+ "libaconfig_storage_read_api_cc",
"libbinder_ndk",
"libcrypto",
"libfmq",
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index cd247c39ba..2f9459a9b6 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -213,6 +213,7 @@ cc_library_static {
static_libs: [
"bluetooth_flags_c_lib",
"lib-bt-packets",
+ "libaconfig_storage_read_api_cc",
"libbase",
"libbluetooth_hci_pdl",
"libbluetooth_log",
@@ -288,6 +289,7 @@ cc_test {
"BluetoothGeneratedDumpsysDataSchema_h",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libcrypto",
"libcutils",
"libhidlbase",
@@ -302,6 +304,7 @@ cc_test {
"android.hardware.common-V2-ndk",
"android.hardware.common.fmq-V1-ndk",
"bluetooth_flags_c_lib",
+ "libaconfig_storage_read_api_cc",
"libbase",
"libbluetooth-types",
"libbluetooth_crypto_toolbox",
@@ -377,6 +380,7 @@ cc_test {
"BluetoothGeneratedDumpsysDataSchema_h",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"liblog",
@@ -422,6 +426,7 @@ cc_test {
"test/bta_hf_client_security_test.cc",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"libcutils",
@@ -484,6 +489,7 @@ cc_test {
"test/bta_rfcomm_scn_test.cc",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"libcutils",
@@ -551,6 +557,7 @@ cc_test {
"test/common/btm_api_mock.cc",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"liblog",
@@ -919,6 +926,7 @@ cc_test {
"LeAudioSetConfigSchemas_h",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"libhidlbase",
@@ -1004,6 +1012,7 @@ cc_test {
"test/common/mock_device_groups.cc",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"libhidlbase",
@@ -1308,6 +1317,7 @@ cc_test {
"test/bta_hh_test.cc",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"liblog",
@@ -1379,6 +1389,7 @@ cc_test {
"test/bta_jv_test.cc",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"liblog",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 3c8c7bf1e8..96e6027d14 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -287,6 +287,7 @@ cc_test {
],
header_libs: ["libbluetooth_headers"],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"libcutils",
@@ -589,6 +590,7 @@ cc_test {
],
header_libs: ["libbluetooth_headers"],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"libcutils",
@@ -712,6 +714,7 @@ cc_test {
],
header_libs: ["libbluetooth_headers"],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"libcrypto",
"libcutils",
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 1292920110..fd6636b0c5 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -9,7 +9,9 @@ package {
cc_defaults {
name: "fluoride_defaults",
- defaults: ["bluetooth_cflags"],
+ defaults: [
+ "bluetooth_cflags",
+ ],
cflags: [
"-DEXPORT_SYMBOL=__attribute__((visibility(\"default\")))",
"-DLOG_NDEBUG=0",
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 09c0f2d570..aaf1fb991d 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -41,6 +41,7 @@ cc_library_static {
"libbt_shim_bridge",
"libflatbuffers-cpp",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
}
@@ -98,6 +99,7 @@ cc_test {
"libbase",
"libdl",
"liblog",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"bluetooth_flags_c_lib",
diff --git a/system/device/fuzzer/Android.bp b/system/device/fuzzer/Android.bp
index e600270558..0109f1ba91 100644
--- a/system/device/fuzzer/Android.bp
+++ b/system/device/fuzzer/Android.bp
@@ -38,6 +38,7 @@ cc_fuzz {
"libdl",
"liblog",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h",
diff --git a/system/gd/Android.bp b/system/gd/Android.bp
index 3c876a05d6..5bcea9ffb1 100644
--- a/system/gd/Android.bp
+++ b/system/gd/Android.bp
@@ -185,6 +185,7 @@ cc_defaults {
"libcom.android.sysprop.bluetooth.wrapped",
"libosi",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
include_dirs: [
"packages/modules/Bluetooth/system/include",
@@ -339,6 +340,7 @@ cc_binary {
"libprotobuf-cpp-full",
"libunwindstack",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
target: {
android: {
@@ -508,6 +510,7 @@ cc_test {
"libPlatformProperties",
"libcrypto",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
sanitize: {
address: true,
@@ -567,6 +570,7 @@ cc_test {
"liblog",
"libosi",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
shared_libs: [
"libcrypto",
@@ -662,6 +666,7 @@ cc_defaults {
"libgrpc_wrap",
"liblog",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
cflags: [
"-DFUZZ_TARGET",
diff --git a/system/gd/rust/topshim/facade/Android.bp b/system/gd/rust/topshim/facade/Android.bp
index c384e2b94a..5bb81175ee 100644
--- a/system/gd/rust/topshim/facade/Android.bp
+++ b/system/gd/rust/topshim/facade/Android.bp
@@ -84,6 +84,7 @@ rust_defaults {
"libgrpc_wrap",
"liblog",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
proc_macros: [
"libpaste",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 6cdec85c24..9227ed28b2 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -229,6 +229,7 @@ cc_test {
"libbinder_ndk",
"libcrypto",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
sanitize: {
address: true,
@@ -311,6 +312,7 @@ cc_test {
"libPlatformProperties",
"libcrypto",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
target: {
linux: {
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 19a77ec8b0..f3c7fadd3d 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -95,6 +95,7 @@ cc_library_static {
"libbt-platform-protos-lite",
"libbt_shim_bridge",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
}
@@ -130,6 +131,7 @@ cc_test {
"libcutils",
"liblog",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
local_include_dirs: [
"include_internal",
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index 4cb4a82b32..dc76eb00cd 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -66,6 +66,7 @@ cc_test {
],
shared_libs: [
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"avrcp-target-service",
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index fcdd01a356..0c34e6e054 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -305,6 +305,7 @@ cc_library_static {
"libbt_shim_bridge",
"libcom.android.sysprop.bluetooth.wrapped",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
shared_libs: [
"libPlatformProperties",
@@ -421,6 +422,7 @@ cc_fuzz {
],
shared_libs: [
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
}
@@ -463,6 +465,7 @@ cc_fuzz {
],
shared_libs: [
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"bluetooth_flags_c_lib",
@@ -512,6 +515,7 @@ cc_fuzz {
],
shared_libs: [
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"bluetooth_flags_c_lib",
@@ -609,6 +613,7 @@ cc_fuzz {
],
shared_libs: [
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"bluetooth_flags_c_lib",
@@ -671,6 +676,7 @@ cc_fuzz {
"libbase",
"liblog",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
target: {
android: {
@@ -718,6 +724,7 @@ cc_test {
"libutils",
"libz",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"android.hardware.audio.common@5.0",
@@ -923,6 +930,7 @@ cc_test {
"libcrypto",
"libcutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"libbase",
@@ -1064,6 +1072,7 @@ cc_test {
"libcrypto",
"libcutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"libbase",
@@ -1361,6 +1370,7 @@ cc_test {
"libcrypto",
"libcutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"libbase",
@@ -1648,6 +1658,7 @@ cc_test {
shared_libs: [
"libcrypto",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
sanitize: {
address: true,
@@ -1935,6 +1946,7 @@ cc_test {
"libcrypto",
"libcutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
target: {
android: {
@@ -2026,6 +2038,7 @@ cc_test {
"libcrypto",
"libcutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
target: {
android: {
@@ -2118,6 +2131,7 @@ cc_test {
"libbinder_ndk",
"libcrypto",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
target: {
android: {
@@ -2188,6 +2202,7 @@ cc_test {
"libcrypto",
"libcutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
header_libs: ["libbluetooth_headers"],
}
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index 66e8ee08c7..0aea363d25 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/Android.bp
@@ -83,5 +83,6 @@ cc_defaults {
"libstatssocket",
"libutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
}
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index 1f6e0b4c26..e63a8db30b 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -136,6 +136,7 @@ cc_binary {
"liblog", // __android_log_print
"libutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
header_libs: ["libbluetooth_headers"],
target: {
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 505d7ab089..a0d2e3e369 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -134,6 +134,7 @@ cc_test {
"libprotobuf-cpp-lite",
],
shared_libs: [
+ "libaconfig_storage_read_api_cc",
"libbase",
"server_configurable_flags",
],