From 6e204dfda1c5b590f7f926facfcde6bb954f4540 Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Sun, 19 Mar 2023 21:02:51 +0000
Subject: [PATCH] Format build files with bpfmt
Test: TreeHugger
Change-Id: I9351bf55695797eeed568adf3fbdbb761859b98f
---
android/app/Android.bp | 9 +-
android/pandora/server/Android.bp | 4 +-
android/pandora/test/Android.bp | 7 +-
framework/Android.bp | 5 +-
pandora/interfaces/Android.bp | 2 +-
pandora/interfaces/python/Android.bp | 28 +-
service/Android.bp | 15 +-
sysprop/Android.bp | 28 +-
system/Android.bp | 2 +-
system/audio_hal_interface/Android.bp | 2 +-
system/bta/Android.bp | 82 ++---
system/btcore/Android.bp | 4 +-
system/btif/Android.bp | 367 ++++++++++----------
system/build/Android.bp | 28 +-
system/common/Android.bp | 2 +-
system/conf/Android.bp | 2 +-
system/device/Android.bp | 4 +-
system/device/fuzzer/Android.bp | 4 +-
system/embdrv/encoder_for_aptx/Android.bp | 7 +-
system/embdrv/encoder_for_aptxhd/Android.bp | 7 +-
system/embdrv/g722/Android.bp | 2 +-
system/embdrv/lc3/Android.bp | 33 +-
system/embdrv/sbc/decoder/Android.bp | 2 +-
system/embdrv/sbc/encoder/Android.bp | 2 +-
system/embdrv/tests/Android.bp | 8 +-
system/gd/Android.bp | 55 +--
system/gd/common/testing/Android.bp | 12 +-
system/gd/crypto_toolbox/Android.bp | 4 +-
system/gd/dumpsys/Android.bp | 22 +-
system/gd/dumpsys/bundler/Android.bp | 3 +-
system/gd/hci/Android.bp | 2 +-
system/gd/iso/Android.bp | 6 +-
system/gd/l2cap/fuzz/Android.bp | 4 +-
system/gd/neighbor/Android.bp | 14 +-
system/gd/os/Android.bp | 11 +-
system/gd/rust/common/Android.bp | 88 ++---
system/gd/rust/facade/Android.bp | 52 +--
system/gd/rust/shim/Android.bp | 11 +-
system/gd/rust/stack/Android.bp | 6 +-
system/gd/rust/topshim/Android.bp | 2 +-
system/gd/rust/topshim/facade/Android.bp | 9 +-
system/gd/security/Android.bp | 8 +-
system/gd/security/channel/Android.bp | 4 +-
system/gd/security/pairing/Android.bp | 4 +-
system/gd/security/record/Android.bp | 4 +-
system/gd/shim/Android.bp | 10 +-
system/gd/storage/Android.bp | 38 +-
system/hci/Android.bp | 3 +-
system/include/Android.bp | 2 +-
system/main/Android.bp | 8 +-
system/main/shim/Android.bp | 2 +-
system/osi/Android.bp | 15 +-
system/osi/test/fuzzers/alarm/Android.bp | 2 +-
system/profile/avrcp/Android.bp | 2 +-
system/rust/Android.bp | 7 +-
system/stack/Android.bp | 74 ++--
system/test/Android.bp | 350 +++++++++----------
system/test/headless/Android.bp | 50 +--
system/test/rootcanal/Android.bp | 14 +-
system/types/Android.bp | 8 +-
system/udrv/Android.bp | 2 +-
system/utils/Android.bp | 2 +-
tools/rootcanal/Android.bp | 10 +-
tools/rootcanal/lmp/Android.bp | 7 +-
64 files changed, 821 insertions(+), 762 deletions(-)
diff --git a/android/app/Android.bp b/android/app/Android.bp
index fe880cc8654..7bd56b927ea 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -136,7 +136,10 @@ android_app {
"src/**/*.java",
":statslog-bluetooth-java-gen",
],
- aaptflags: [ "--custom-package", "com.android.bluetooth" ],
+ aaptflags: [
+ "--custom-package",
+ "com.android.bluetooth",
+ ],
certificate: ":com.android.bluetooth.certificate",
jarjar_rules: ":bluetooth-jarjar-rules",
@@ -217,7 +220,7 @@ android_app {
java_library {
name: "bluetooth.change-ids",
srcs: [
- "src/com/android/bluetooth/ChangeIds.java"
+ "src/com/android/bluetooth/ChangeIds.java",
],
libs: [
"app-compat-annotations",
@@ -261,5 +264,5 @@ genrule {
android_app_certificate {
name: "com.android.bluetooth.certificate",
- certificate: "certs/com.android.bluetooth"
+ certificate: "certs/com.android.bluetooth",
}
diff --git a/android/pandora/server/Android.bp b/android/pandora/server/Android.bp
index 1064e177d70..f6e8668a27b 100644
--- a/android/pandora/server/Android.bp
+++ b/android/pandora/server/Android.bp
@@ -59,7 +59,7 @@ android_test {
test_config: "configs/PtsBotTest.xml",
data: [
"configs/pts_bot_tests_config.json",
- ":mmi2grpc"
+ ":mmi2grpc",
],
test_suites: ["device-tests"],
min_sdk_version: "Tiramisu",
@@ -71,7 +71,7 @@ android_test {
test_config: "configs/PtsBotTestMts.xml",
data: [
"configs/pts_bot_tests_config.json",
- ":mmi2grpc"
+ ":mmi2grpc",
],
test_suites: ["mts-bluetooth"],
min_sdk_version: "Tiramisu",
diff --git a/android/pandora/test/Android.bp b/android/pandora/test/Android.bp
index f325f917d55..bc39f0561cf 100644
--- a/android/pandora/test/Android.bp
+++ b/android/pandora/test/Android.bp
@@ -28,7 +28,10 @@ python_test_host {
"libavatar",
"bumble_services_experimental-python",
],
- required: ["PandoraServer", "aapt"],
+ required: [
+ "PandoraServer",
+ "aapt",
+ ],
test_suites: ["general-tests"],
test_options: {
unit_test: false,
@@ -45,5 +48,5 @@ sh_binary_host {
"pandora_experimental-python-gen-src",
"tradefed",
"tradefed-test-framework",
- ]
+ ],
}
diff --git a/framework/Android.bp b/framework/Android.bp
index 7c080cb42d6..6381836fd76 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -60,7 +60,7 @@ java_sdk_library {
jarjar_rules: ":bluetooth-jarjar-rules",
installable: true,
optimize: {
- enabled: false
+ enabled: false,
},
hostdex: true, // for hiddenapi check
@@ -122,8 +122,7 @@ java_api_contribution {
],
}
-platform_compat_config
-{
+platform_compat_config {
name: "framework-bluetooth-compat-config",
src: ":framework-bluetooth",
}
diff --git a/pandora/interfaces/Android.bp b/pandora/interfaces/Android.bp
index e782ef0423a..ea0c679db26 100644
--- a/pandora/interfaces/Android.bp
+++ b/pandora/interfaces/Android.bp
@@ -25,7 +25,7 @@ java_library {
],
plugin: "grpc-java-plugin",
output_params: [
- "lite",
+ "lite",
],
},
}
diff --git a/pandora/interfaces/python/Android.bp b/pandora/interfaces/python/Android.bp
index b463690fab8..886f7298c46 100644
--- a/pandora/interfaces/python/Android.bp
+++ b/pandora/interfaces/python/Android.bp
@@ -6,18 +6,18 @@ genrule {
name: "pandora_experimental-python-gen-src",
tools: [
"aprotoc",
- "protoc-gen-pandora-python"
+ "protoc-gen-pandora-python",
],
cmd: "$(location aprotoc)" +
- " -Ipackages/modules/Bluetooth/pandora/interfaces" +
- " -Iexternal/pandora/bt-test-interfaces" +
- " -Iexternal/protobuf/src" +
- " --plugin=protoc-gen-grpc=$(location protoc-gen-pandora-python)" +
- " --python_out=$(genDir)" +
- " --grpc_out=$(genDir)" +
- " $(in) &&" +
- "touch $(genDir)/pandora_experimental/py.typed &&" +
- "touch $(genDir)/pandora_experimental/__init__.py",
+ " -Ipackages/modules/Bluetooth/pandora/interfaces" +
+ " -Iexternal/pandora/bt-test-interfaces" +
+ " -Iexternal/protobuf/src" +
+ " --plugin=protoc-gen-grpc=$(location protoc-gen-pandora-python)" +
+ " --python_out=$(genDir)" +
+ " --grpc_out=$(genDir)" +
+ " $(in) &&" +
+ "touch $(genDir)/pandora_experimental/py.typed &&" +
+ "touch $(genDir)/pandora_experimental/__init__.py",
srcs: [
":pandora-protos",
":pandora_experimental-protos",
@@ -70,17 +70,17 @@ genrule {
"pandora_experimental/rfcomm_grpc_aio.py",
"pandora_experimental/rfcomm_pb2.py",
"pandora_experimental/rfcomm_pb2.pyi",
- ]
+ ],
}
filegroup {
name: "pandora_experimental-python-src",
srcs: [
- ":pandora_experimental-python-gen-src"
+ ":pandora_experimental-python-gen-src",
],
exclude_srcs: [
":pandora_experimental-python-stubs",
- ]
+ ],
}
filegroup {
@@ -107,5 +107,5 @@ python_library_host {
libs: ["pandora-python"],
data: [
":pandora_experimental-python-stubs",
- ]
+ ],
}
diff --git a/service/Android.bp b/service/Android.bp
index 915f4233f9a..00f74107862 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -75,7 +75,7 @@ java_library {
apex_available: [
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
// service-bluetooth static library
@@ -108,7 +108,7 @@ java_library {
apex_available: [
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
java_library {
@@ -117,7 +117,7 @@ java_library {
proto: {
type: "stream",
include_dirs: [
- "external/protobuf/src",
+ "external/protobuf/src",
],
},
srcs: [
@@ -127,7 +127,7 @@ java_library {
apex_available: [
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
java_library {
@@ -144,11 +144,12 @@ java_library {
apex_available: [
"com.android.btservices",
],
- lint: { strict_updatability_linting: true },
+ lint: {
+ strict_updatability_linting: true,
+ },
}
-platform_compat_config
-{
+platform_compat_config {
name: "bluetooth-compat-config",
src: ":service-bluetooth-pre-jarjar",
}
diff --git a/sysprop/Android.bp b/sysprop/Android.bp
index 67cc6eb5f57..f3842c8c3b7 100644
--- a/sysprop/Android.bp
+++ b/sysprop/Android.bp
@@ -3,18 +3,18 @@ package {
}
sysprop_library {
- name: "com.android.sysprop.bluetooth",
- host_supported: true,
- srcs: [
- "avrcp.sysprop",
- "bta.sysprop",
- "hfp.sysprop",
- "pan.sysprop",
- ],
- property_owner: "Platform",
- api_packages: ["android.sysprop"],
- cpp: {
- min_sdk_version: "Tiramisu",
- },
- apex_available: ["com.android.btservices"],
+ name: "com.android.sysprop.bluetooth",
+ host_supported: true,
+ srcs: [
+ "avrcp.sysprop",
+ "bta.sysprop",
+ "hfp.sysprop",
+ "pan.sysprop",
+ ],
+ property_owner: "Platform",
+ api_packages: ["android.sysprop"],
+ cpp: {
+ min_sdk_version: "Tiramisu",
+ },
+ apex_available: ["com.android.btservices"],
}
diff --git a/system/Android.bp b/system/Android.bp
index d1afd9162ea..1301406d92f 100644
--- a/system/Android.bp
+++ b/system/Android.bp
@@ -179,6 +179,6 @@ genrule {
srcs: ["blueberry/facade/topshim/facade.proto"],
out: [
"blueberry/facade/topshim/facade_pb2.py",
- "blueberry/facade/topshim/facade_pb2_grpc.py"
+ "blueberry/facade/topshim/facade_pb2_grpc.py",
],
}
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index 714ae08d6fa..7ba1bb5ec84 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -70,7 +70,7 @@ cc_library_static {
apex_available: [
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
// Bluetooth Audio client interface library unit tests for target and host
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 315ca78f141..da47f72d4a6 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -39,15 +39,15 @@ cc_defaults {
}
filegroup {
- name: "BtaDmSources",
- srcs: [
- "dm/bta_dm_act.cc",
- "dm/bta_dm_api.cc",
- "dm/bta_dm_cfg.cc",
- "dm/bta_dm_ci.cc",
- "dm/bta_dm_main.cc",
- "dm/bta_dm_pm.cc",
- ],
+ name: "BtaDmSources",
+ srcs: [
+ "dm/bta_dm_act.cc",
+ "dm/bta_dm_api.cc",
+ "dm/bta_dm_cfg.cc",
+ "dm/bta_dm_ci.cc",
+ "dm/bta_dm_main.cc",
+ "dm/bta_dm_pm.cc",
+ ],
}
// BTA static library for target
@@ -137,7 +137,7 @@ cc_library_static {
"LeAudioSetConfigSchemas_h",
],
host_supported: true,
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
cc_library_static {
@@ -179,7 +179,7 @@ cc_library_static {
"libcom.android.sysprop.bluetooth",
],
host_supported: true,
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
// bta unit tests for target
@@ -187,7 +187,7 @@ cc_test {
name: "net_test_bta",
defaults: [
"fluoride_bta_defaults",
- "mts_defaults"
+ "mts_defaults",
],
test_suites: ["device-tests"],
srcs: [
@@ -336,7 +336,7 @@ cc_test {
"packages/modules/Bluetooth/system/btif/include",
"packages/modules/Bluetooth/system/osi/include",
],
- srcs : [
+ srcs: [
":TestCommonMockFunctions",
":TestMockBtif",
":TestMockMainShimLeScanning",
@@ -353,7 +353,7 @@ cc_test {
shared_libs: [
"libcrypto",
],
- static_libs : [
+ static_libs: [
"crypto_toolbox_for_tests",
"libgmock",
"libbt-common",
@@ -367,7 +367,7 @@ cc_test {
all_undefined: true,
integer_overflow: true,
diag: {
- undefined : true
+ undefined: true,
},
},
}
@@ -386,7 +386,7 @@ cc_test {
"packages/modules/Bluetooth/system",
"packages/modules/Bluetooth/system/bta/include",
],
- srcs : [
+ srcs: [
":TestCommonMockFunctions",
":TestMockBtif",
"groups/groups_test.cc",
@@ -395,7 +395,7 @@ cc_test {
shared_libs: [
"libcrypto",
],
- static_libs : [
+ static_libs: [
"crypto_toolbox_for_tests",
"libgmock",
"libbt-common",
@@ -409,7 +409,7 @@ cc_test {
all_undefined: true,
integer_overflow: true,
diag: {
- undefined : true
+ undefined: true,
},
},
}
@@ -431,7 +431,7 @@ cc_test {
"packages/modules/Bluetooth/system/gd",
"packages/modules/Bluetooth/system/stack/include",
],
- srcs : [
+ srcs: [
":TestCommonMockFunctions",
":TestMockOsi",
"gatt/database.cc",
@@ -448,12 +448,12 @@ cc_test {
shared_libs: [
"libcrypto",
],
- static_libs : [
+ static_libs: [
"crypto_toolbox_for_tests",
"libgmock",
"libbt-common",
"libbt-protos-lite",
- "libosi"
+ "libosi",
],
sanitize: {
cfi: false,
@@ -564,7 +564,7 @@ cc_test {
"packages/modules/Bluetooth/system/gd",
"packages/modules/Bluetooth/system/stack/include",
],
- srcs : [
+ srcs: [
":TestCommonMockFunctions",
":TestMockBtaLeAudioHalVerifier",
":TestStubOsi",
@@ -598,19 +598,19 @@ cc_test {
":audio_set_scenarios_bfbs",
":audio_set_scenarios_json",
":audio_set_configurations_bfbs",
- ":audio_set_configurations_json"
+ ":audio_set_configurations_json",
],
generated_headers: [
"LeAudioSetConfigSchemas_h",
],
shared_libs: [
"libcrypto",
- "liblog", // __android_log_print
+ "liblog", // __android_log_print
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
"libhidlbase",
],
- static_libs : [
+ static_libs: [
"libgmock",
"libbt-common",
"libbt-protos-lite",
@@ -639,7 +639,7 @@ cc_test {
"packages/modules/Bluetooth/system/bta/test/common",
"packages/modules/Bluetooth/system/stack/include",
],
- srcs : [
+ srcs: [
":TestCommonMockFunctions",
":TestMockBtaLeAudioHalVerifier",
":TestStubOsi",
@@ -676,7 +676,7 @@ cc_test {
"libfmq",
"libbinder_ndk",
],
- static_libs : [
+ static_libs: [
"libbt-audio-hal-interface",
"crypto_toolbox_for_tests",
"libgmock",
@@ -710,7 +710,7 @@ cc_test {
all_undefined: true,
integer_overflow: true,
diag: {
- undefined : true
+ undefined: true,
},
},
}
@@ -734,7 +734,7 @@ cc_test {
"packages/modules/Bluetooth/system/stack/include",
"packages/modules/Bluetooth/system/stack/btm",
],
- srcs : [
+ srcs: [
"le_audio/broadcaster/broadcaster_types.cc",
"le_audio/broadcaster/mock_ble_advertising_manager.cc",
"le_audio/broadcaster/state_machine.cc",
@@ -748,7 +748,7 @@ cc_test {
shared_libs: [
"libcrypto",
],
- static_libs : [
+ static_libs: [
"libgmock",
"libbt-common",
"libbt-protos-lite",
@@ -761,7 +761,7 @@ cc_test {
all_undefined: true,
integer_overflow: true,
diag: {
- undefined : true
+ undefined: true,
},
},
}
@@ -784,7 +784,7 @@ cc_test {
"packages/modules/Bluetooth/system/stack/include",
"packages/modules/Bluetooth/system/stack/btm",
],
- srcs : [
+ srcs: [
":TestStubOsi",
"le_audio/broadcaster/broadcaster.cc",
"le_audio/broadcaster/broadcaster_test.cc",
@@ -809,7 +809,7 @@ cc_test {
"android.hardware.bluetooth.audio@2.1",
"libhidlbase",
],
- static_libs : [
+ static_libs: [
"libbt-audio-hal-interface",
"libgmock",
"libbt-common",
@@ -832,7 +832,7 @@ cc_test {
all_undefined: true,
integer_overflow: true,
diag: {
- undefined : true
+ undefined: true,
},
},
}
@@ -854,7 +854,7 @@ cc_test {
"packages/modules/Bluetooth/system/bta/test/common",
"packages/modules/Bluetooth/system/stack/include",
],
- srcs : [
+ srcs: [
"gatt/database.cc",
"gatt/database_builder.cc",
"has/has_client.cc",
@@ -875,7 +875,7 @@ cc_test {
shared_libs: [
"libcrypto",
],
- static_libs : [
+ static_libs: [
"crypto_toolbox_for_tests",
"libgmock",
"libbt-common",
@@ -888,7 +888,7 @@ cc_test {
all_undefined: true,
integer_overflow: true,
diag: {
- undefined : true
+ undefined: true,
},
},
}
@@ -910,7 +910,7 @@ cc_test {
"packages/modules/Bluetooth/system/bta/test/common",
"packages/modules/Bluetooth/system/stack/include",
],
- srcs : [
+ srcs: [
":TestMockMainShim",
":TestCommonLogMsg",
":TestCommonMainHandler",
@@ -939,7 +939,7 @@ cc_test {
shared_libs: [
"libcrypto",
],
- static_libs : [
+ static_libs: [
"crypto_toolbox_for_tests",
"libgmock",
"libbt-common",
@@ -958,12 +958,12 @@ cc_test {
all_undefined: true,
integer_overflow: true,
diag: {
- undefined : true
+ undefined: true,
},
},
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index 62e11249268..aea11045d85 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -59,12 +59,12 @@ cc_library_static {
cc_library_static {
name: "libbtcore",
- visibility:[
+ visibility: [
"//packages/apps/Test/connectivity/sl4n",
"//packages/modules/Bluetooth:__subpackages__",
],
defaults: ["libbtcore_defaults"],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
cc_library_headers {
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index ed5822276aa..3aacc0f502b 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -53,7 +53,7 @@ cc_library {
"libstatssocket",
],
export_shared_lib_headers: [
- "libstatssocket",
+ "libstatssocket",
],
},
host: {
@@ -73,16 +73,16 @@ cc_library {
genrule {
name: "statslog_bt.h",
tools: ["stats-log-api-gen"],
- cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_bt.h --module bluetooth"
- + " --namespace bluetooth",
+ cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_bt.h --module bluetooth" +
+ " --namespace bluetooth",
out: ["statslog_bt.h"],
}
genrule {
name: "statslog_bt.cpp",
tools: ["stats-log-api-gen"],
- cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_bt.cpp --module bluetooth"
- + " --namespace bluetooth --importHeader statslog_bt.h",
+ cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_bt.cpp --module bluetooth" +
+ " --namespace bluetooth --importHeader statslog_bt.h",
out: ["statslog_bt.cpp"],
}
@@ -129,7 +129,7 @@ cc_library_static {
"BluetoothGeneratedPackets_h",
],
local_include_dirs: [
- "include"
+ "include",
],
target: {
android: {
@@ -140,9 +140,9 @@ cc_library_static {
},
host: {
srcs: [
- "src/btif_avrcp_audio_track_linux.cc",
- "src/btif_leaudio_hal_version_host.cc",
- ],
+ "src/btif_avrcp_audio_track_linux.cc",
+ "src/btif_leaudio_hal_version_host.cc",
+ ],
},
},
static_libs: [
@@ -160,7 +160,7 @@ cc_library_static {
"-DBUILDCFG",
],
host_supported: true,
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
cc_library_static {
@@ -218,9 +218,9 @@ cc_library_static {
},
host: {
srcs: [
- "src/btif_avrcp_audio_track_linux.cc",
- "src/btif_leaudio_hal_version_host.cc",
- ],
+ "src/btif_avrcp_audio_track_linux.cc",
+ "src/btif_leaudio_hal_version_host.cc",
+ ],
},
},
static_libs: [
@@ -236,7 +236,7 @@ cc_library_static {
"-DBUILDCFG",
],
host_supported: true,
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
// btif unit tests for target
@@ -290,7 +290,7 @@ cc_test {
"libosi",
"libprotobuf-cpp-lite",
"libudrv-uipc",
- ],
+ ],
whole_static_libs: [
"libbluetooth-dumpsys",
"libbluetooth-for-tests",
@@ -340,7 +340,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -383,7 +383,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -455,7 +455,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -492,96 +492,97 @@ cc_test {
"packages/modules/Bluetooth/system/vnd/include",
"system/libfmq/include",
"system/libhwbinder/include",
- ],
- srcs: [
- ":LibBluetoothSources",
- ":TestCommonMainHandler",
- ":TestCommonMockFunctions",
- ":TestCommonCoreInterface",
- ":TestMockAndroidHardware",
- ":BtaDmSources",
- ":TestMockBtaAg",
- ":TestMockBtaAr",
- ":TestMockBtaAv",
- ":TestMockBtaCsis",
- ":TestMockBtaGatt",
- ":TestMockBtaGroups",
- ":TestMockBtaHas",
- ":TestMockBtaHd",
- ":TestMockBtaHearingAid",
- ":TestMockBtaHf",
- ":TestMockBtaHh",
- ":TestMockBtaJv",
- ":TestMockBtaLeAudio",
- ":TestMockBtaLeAudioHalVerifier",
- ":TestMockBtaPan",
- ":TestMockBtaSdp",
- ":TestMockBtaSys",
- ":TestMockBtaVc",
- ":TestMockBtu",
- ":TestMockBtcore",
- ":TestMockCommon",
- ":TestMockFrameworks",
- ":TestMockHci",
- ":TestMockMainShim",
- ":TestMockOsi",
- ":TestMockStack",
- ":TestMockSystemLibfmq",
- ":TestMockUdrv",
- ":TestMockUtils",
- "test/btif_hh_test.cc",
- ],
- generated_headers: [
+ ],
+ srcs: [
+ ":LibBluetoothSources",
+ ":TestCommonMainHandler",
+ ":TestCommonMockFunctions",
+ ":TestCommonCoreInterface",
+ ":TestMockAndroidHardware",
+ ":BtaDmSources",
+ ":TestMockBtaAg",
+ ":TestMockBtaAr",
+ ":TestMockBtaAv",
+ ":TestMockBtaCsis",
+ ":TestMockBtaGatt",
+ ":TestMockBtaGroups",
+ ":TestMockBtaHas",
+ ":TestMockBtaHd",
+ ":TestMockBtaHearingAid",
+ ":TestMockBtaHf",
+ ":TestMockBtaHh",
+ ":TestMockBtaJv",
+ ":TestMockBtaLeAudio",
+ ":TestMockBtaLeAudioHalVerifier",
+ ":TestMockBtaPan",
+ ":TestMockBtaSdp",
+ ":TestMockBtaSys",
+ ":TestMockBtaVc",
+ ":TestMockBtu",
+ ":TestMockBtcore",
+ ":TestMockCommon",
+ ":TestMockFrameworks",
+ ":TestMockHci",
+ ":TestMockMainShim",
+ ":TestMockOsi",
+ ":TestMockStack",
+ ":TestMockSystemLibfmq",
+ ":TestMockUdrv",
+ ":TestMockUtils",
+ "test/btif_hh_test.cc",
+ ],
+ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
- ],
- header_libs: ["libbluetooth_headers"],
- shared_libs: [
- "android.hardware.bluetooth.audio@2.0",
- "android.hardware.bluetooth.audio@2.1",
- "libcrypto",
- "libcutils",
- "libhidlbase",
- "liblog",
- "libtinyxml2",
- ],
- static_libs: [
- "android.hardware.bluetooth.a2dp@1.0",
- "avrcp-target-service",
- "libaudio-a2dp-hw-utils",
- "libbluetooth-types",
- "libbt-audio-hal-interface",
- "libbt-sbc-decoder",
- "libbt-sbc-encoder",
- "libbt-stack",
- "libbt-stack-core",
- "libbtif",
- "libbtif-core",
- "libbtdevice",
- "lib-bt-packets",
- "lib-bt-packets-avrcp",
- "lib-bt-packets-base",
- "libcom.android.sysprop.bluetooth",
- "libc++fs",
- "libflatbuffers-cpp",
- "libgmock",
- ],
- cflags: ["-DBUILDCFG"],
- target: {
- android: {
- shared_libs: [
- "libbinder_ndk",
- "android.hardware.bluetooth.audio-V3-ndk",
- ],
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
- sanitize: {
+ ],
+ header_libs: ["libbluetooth_headers"],
+ shared_libs: [
+ "android.hardware.bluetooth.audio@2.0",
+ "android.hardware.bluetooth.audio@2.1",
+ "libcrypto",
+ "libcutils",
+ "libhidlbase",
+ "liblog",
+ "libtinyxml2",
+ ],
+ static_libs: [
+ "android.hardware.bluetooth.a2dp@1.0",
+ "avrcp-target-service",
+ "libaudio-a2dp-hw-utils",
+ "libbluetooth-types",
+ "libbt-audio-hal-interface",
+ "libbt-sbc-decoder",
+ "libbt-sbc-encoder",
+ "libbt-stack",
+ "libbt-stack-core",
+ "libbtif",
+ "libbtif-core",
+ "libbtdevice",
+ "lib-bt-packets",
+ "lib-bt-packets-avrcp",
+ "lib-bt-packets-base",
+ "libcom.android.sysprop.bluetooth",
+ "libc++fs",
+ "libflatbuffers-cpp",
+ "libgmock",
+ ],
+ cflags: ["-DBUILDCFG"],
+ target: {
+ android: {
+ shared_libs: [
+ "libbinder_ndk",
+ "android.hardware.bluetooth.audio-V3-ndk",
+ ],
+ test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
+ },
+ },
+ sanitize: {
address: true,
cfi: true,
misc_undefined: ["bounds"],
},
}
+
// Cycle stack test
cc_test {
name: "net_test_btif_stack",
@@ -616,90 +617,90 @@ cc_test {
"packages/modules/Bluetooth/system/vnd/include",
"system/libfmq/include",
"system/libhwbinder/include",
- ],
- srcs: [
- ":LibBluetoothSources",
- ":OsiCompatSources",
- ":TestCommonMainHandler",
- ":TestCommonMockFunctions",
- ":TestCommonCoreInterface",
- ":TestMockAndroidHardware",
- ":BtaDmSources",
- ":TestMockBtaAg",
- ":TestMockBtaAr",
- ":TestMockBtaAv",
- ":TestMockBtaCsis",
- ":TestMockBtaGatt",
- ":TestMockBtaGroups",
- ":TestMockBtaHas",
- ":TestMockBtaHd",
- ":TestMockBtaHearingAid",
- ":TestMockBtaHf",
- ":TestMockBtaHh",
- ":TestMockBtaJv",
- ":TestMockBtaLeAudio",
- ":TestMockBtaLeAudioHalVerifier",
- ":TestMockBtaPan",
- ":TestMockBtaSdp",
- ":TestMockBtaSys",
- ":TestMockBtaVc",
- ":TestMockBtu",
- ":TestMockBtcore",
- ":TestMockCommon",
- ":TestMockFrameworks",
- ":TestMockHci",
- ":TestMockMainShim",
- ":TestMockOsi",
- ":TestMockStack",
- ":TestMockSystemLibfmq",
- ":TestMockUdrv",
- ":TestMockUtils",
- "test/btif_core_test.cc",
- ],
- generated_headers: [
+ ],
+ srcs: [
+ ":LibBluetoothSources",
+ ":OsiCompatSources",
+ ":TestCommonMainHandler",
+ ":TestCommonMockFunctions",
+ ":TestCommonCoreInterface",
+ ":TestMockAndroidHardware",
+ ":BtaDmSources",
+ ":TestMockBtaAg",
+ ":TestMockBtaAr",
+ ":TestMockBtaAv",
+ ":TestMockBtaCsis",
+ ":TestMockBtaGatt",
+ ":TestMockBtaGroups",
+ ":TestMockBtaHas",
+ ":TestMockBtaHd",
+ ":TestMockBtaHearingAid",
+ ":TestMockBtaHf",
+ ":TestMockBtaHh",
+ ":TestMockBtaJv",
+ ":TestMockBtaLeAudio",
+ ":TestMockBtaLeAudioHalVerifier",
+ ":TestMockBtaPan",
+ ":TestMockBtaSdp",
+ ":TestMockBtaSys",
+ ":TestMockBtaVc",
+ ":TestMockBtu",
+ ":TestMockBtcore",
+ ":TestMockCommon",
+ ":TestMockFrameworks",
+ ":TestMockHci",
+ ":TestMockMainShim",
+ ":TestMockOsi",
+ ":TestMockStack",
+ ":TestMockSystemLibfmq",
+ ":TestMockUdrv",
+ ":TestMockUtils",
+ "test/btif_core_test.cc",
+ ],
+ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
- ],
- header_libs: ["libbluetooth_headers"],
- shared_libs: [
- "android.hardware.bluetooth.audio@2.0",
- "android.hardware.bluetooth.audio@2.1",
- "libcrypto",
- "libcutils",
- "libhidlbase",
- "liblog",
- "libtinyxml2",
- ],
- static_libs: [
- "android.hardware.bluetooth.a2dp@1.0",
- "avrcp-target-service",
- "libaudio-a2dp-hw-utils",
- "libbluetooth-types",
- "libbt-audio-hal-interface",
- "libbt-sbc-decoder",
- "libbt-sbc-encoder",
- "libbtif",
- "libbtif-core",
- "libbtdevice",
- "lib-bt-packets",
- "lib-bt-packets-avrcp",
- "lib-bt-packets-base",
- "libcom.android.sysprop.bluetooth",
- "libc++fs",
- "libflatbuffers-cpp",
- "libgmock",
- ],
- cflags: ["-DBUILDCFG"],
- target: {
- android: {
- shared_libs: [
- "libbinder_ndk",
- "android.hardware.bluetooth.audio-V3-ndk",
- ],
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
- sanitize: {
+ ],
+ header_libs: ["libbluetooth_headers"],
+ shared_libs: [
+ "android.hardware.bluetooth.audio@2.0",
+ "android.hardware.bluetooth.audio@2.1",
+ "libcrypto",
+ "libcutils",
+ "libhidlbase",
+ "liblog",
+ "libtinyxml2",
+ ],
+ static_libs: [
+ "android.hardware.bluetooth.a2dp@1.0",
+ "avrcp-target-service",
+ "libaudio-a2dp-hw-utils",
+ "libbluetooth-types",
+ "libbt-audio-hal-interface",
+ "libbt-sbc-decoder",
+ "libbt-sbc-encoder",
+ "libbtif",
+ "libbtif-core",
+ "libbtdevice",
+ "lib-bt-packets",
+ "lib-bt-packets-avrcp",
+ "lib-bt-packets-base",
+ "libcom.android.sysprop.bluetooth",
+ "libc++fs",
+ "libflatbuffers-cpp",
+ "libgmock",
+ ],
+ cflags: ["-DBUILDCFG"],
+ target: {
+ android: {
+ shared_libs: [
+ "libbinder_ndk",
+ "android.hardware.bluetooth.audio-V3-ndk",
+ ],
+ test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
+ },
+ },
+ sanitize: {
address: true,
cfi: true,
misc_undefined: ["bounds"],
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 0f772087d59..feed3d25584 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -39,7 +39,7 @@ cc_defaults {
"libevent",
],
shared_libs: [
- "libbase",
+ "libbase",
],
target: {
darwin: {
@@ -50,7 +50,7 @@ cc_defaults {
"libcutils",
"liblog",
],
- }
+ },
},
}
@@ -66,7 +66,6 @@ cc_defaults {
},
}
-
// Fuzzable defaults are the subset of defaults that are used in fuzzing, which
// requires no shared libraries, and no explicit sanitization.
cc_defaults {
@@ -95,7 +94,7 @@ cc_defaults {
name: "fluoride_types_defaults",
defaults: [
"fluoride_types_defaults_fuzzable",
- "libchrome_support_defaults"
+ "libchrome_support_defaults",
],
}
@@ -111,15 +110,18 @@ cc_defaults {
host: {
static_libs: [
"libcutils",
- ]
- }
+ ],
+ },
},
defaults: ["fluoride_types_defaults_fuzzable"],
- header_libs: ["libbluetooth_headers", "libbt_callbacks_cxx_headers"],
+ header_libs: [
+ "libbluetooth_headers",
+ "libbt_callbacks_cxx_headers",
+ ],
generated_headers: [
"libbt_shim_bridge_header",
"libbt_message_loop_thread_bridge_header",
- "cxx-bridge-header"
+ "cxx-bridge-header",
],
include_dirs: ["packages/modules/Bluetooth/system/gd/rust/shim"],
static_libs: [
@@ -176,7 +178,10 @@ cc_defaults {
cc_defaults {
name: "fluoride_basic_defaults",
- defaults: ["fluoride_test_prod_shared_defaults", "libchrome_support_defaults"],
+ defaults: [
+ "fluoride_test_prod_shared_defaults",
+ "libchrome_support_defaults",
+ ],
apex_available: [
"//apex_available:platform",
"com.android.btservices",
@@ -279,7 +284,10 @@ cc_defaults {
cc_defaults {
name: "fluoride_defaults",
- defaults: ["fluoride_defaults_fuzzable", "fluoride_types_defaults"],
+ defaults: [
+ "fluoride_defaults_fuzzable",
+ "fluoride_types_defaults",
+ ],
static_libs: [
"libbluetooth_gd",
"libbluetooth_rust_interop",
diff --git a/system/common/Android.bp b/system/common/Android.bp
index fb97fe33d88..18aa470498f 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -38,7 +38,7 @@ cc_library_static {
srcs: ["metrics_linux.cc"],
},
},
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
cc_test {
diff --git a/system/conf/Android.bp b/system/conf/Android.bp
index d7b43de394c..607ab34067a 100644
--- a/system/conf/Android.bp
+++ b/system/conf/Android.bp
@@ -26,4 +26,4 @@ prebuilt_etc {
name: "interop_database.conf",
src: "interop_database.conf",
sub_dir: "bluetooth",
-}
\ No newline at end of file
+}
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 45654d6acf9..c46929f45db 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -28,7 +28,7 @@ cc_library_static {
"src/device_iot_config.cc",
"src/device_iot_config_int.cc",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
// Bluetooth device unit tests for target
@@ -89,4 +89,4 @@ cc_test {
"libosi-AllocationTestHarness",
"libbluetooth-types",
],
-}
\ No newline at end of file
+}
diff --git a/system/device/fuzzer/Android.bp b/system/device/fuzzer/Android.bp
index 4d2ec62cc7e..ab9039b07ce 100644
--- a/system/device/fuzzer/Android.bp
+++ b/system/device/fuzzer/Android.bp
@@ -47,7 +47,7 @@ cc_fuzz {
"-DBUILDCFG",
],
fuzz_config: {
- cc: ["android-bluetooth-security@google.com"],
- componentid: 27441,
+ cc: ["android-bluetooth-security@google.com"],
+ componentid: 27441,
},
}
diff --git a/system/embdrv/encoder_for_aptx/Android.bp b/system/embdrv/encoder_for_aptx/Android.bp
index f71a84a93dd..956b6107efd 100644
--- a/system/embdrv/encoder_for_aptx/Android.bp
+++ b/system/embdrv/encoder_for_aptx/Android.bp
@@ -32,7 +32,12 @@ cc_library_static {
"src/QmfConv.c",
"src/QuantiseDifference.c",
],
- cflags: ["-O2", "-Werror", "-Wall", "-Wextra"],
+ cflags: [
+ "-O2",
+ "-Werror",
+ "-Wall",
+ "-Wextra",
+ ],
tidy: true,
tidy_checks: tidy_errors,
tidy_checks_as_errors: tidy_errors,
diff --git a/system/embdrv/encoder_for_aptxhd/Android.bp b/system/embdrv/encoder_for_aptxhd/Android.bp
index 118ab8ce681..652b4ae9d1d 100644
--- a/system/embdrv/encoder_for_aptxhd/Android.bp
+++ b/system/embdrv/encoder_for_aptxhd/Android.bp
@@ -32,7 +32,12 @@ cc_library_static {
"src/QmfConv.c",
"src/QuantiseDifference.c",
],
- cflags: ["-O2", "-Werror", "-Wall", "-Wextra"],
+ cflags: [
+ "-O2",
+ "-Werror",
+ "-Wall",
+ "-Wextra",
+ ],
tidy: true,
tidy_checks: tidy_errors,
tidy_checks_as_errors: tidy_errors,
diff --git a/system/embdrv/g722/Android.bp b/system/embdrv/g722/Android.bp
index f90d90985d7..53a7b2b140e 100644
--- a/system/embdrv/g722/Android.bp
+++ b/system/embdrv/g722/Android.bp
@@ -24,5 +24,5 @@ cc_library_static {
"//apex_available:platform",
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
diff --git a/system/embdrv/lc3/Android.bp b/system/embdrv/lc3/Android.bp
index 6f92aee786e..8952144950c 100644
--- a/system/embdrv/lc3/Android.bp
+++ b/system/embdrv/lc3/Android.bp
@@ -12,7 +12,7 @@ cc_library_static {
host_supported: true,
apex_available: [
- "com.android.btservices"
+ "com.android.btservices",
],
defaults: ["fluoride_defaults"],
srcs: [
@@ -28,36 +28,35 @@ cc_library_static {
"-Wno-implicit-fallthrough",
],
target: {
- android: {
+ android: {
sanitize: {
- misc_undefined:[
- "unsigned-integer-overflow",
- "signed-integer-overflow",
- "bounds",
+ misc_undefined: [
+ "unsigned-integer-overflow",
+ "signed-integer-overflow",
+ "bounds",
],
cfi: true,
},
- },
+ },
},
export_include_dirs: [
"include",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
cc_fuzz {
- name: "liblc3_fuzzer",
+ name: "liblc3_fuzzer",
- srcs: [
- "fuzzer/liblc3_fuzzer.cpp",
- ],
+ srcs: [
+ "fuzzer/liblc3_fuzzer.cpp",
+ ],
- static_libs: [
- "liblc3",
- ],
+ static_libs: [
+ "liblc3",
+ ],
}
-
cc_binary {
name: "lc3_encoder",
host_supported: true,
@@ -82,4 +81,4 @@ cc_binary {
static_libs: [
"liblc3",
],
-}
\ No newline at end of file
+}
diff --git a/system/embdrv/sbc/decoder/Android.bp b/system/embdrv/sbc/decoder/Android.bp
index c05795fdd4a..b6c8646bb06 100644
--- a/system/embdrv/sbc/decoder/Android.bp
+++ b/system/embdrv/sbc/decoder/Android.bp
@@ -35,7 +35,7 @@ cc_library_static {
apex_available: [
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
cc_fuzz {
diff --git a/system/embdrv/sbc/encoder/Android.bp b/system/embdrv/sbc/encoder/Android.bp
index 5ab7f3a8000..e1140664898 100644
--- a/system/embdrv/sbc/encoder/Android.bp
+++ b/system/embdrv/sbc/encoder/Android.bp
@@ -33,5 +33,5 @@ cc_library_static {
apex_available: [
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
diff --git a/system/embdrv/tests/Android.bp b/system/embdrv/tests/Android.bp
index f1209312000..065569bcbb8 100644
--- a/system/embdrv/tests/Android.bp
+++ b/system/embdrv/tests/Android.bp
@@ -17,8 +17,8 @@ cc_test {
test_options: {
unit_test: true,
},
- srcs: [ "src/aptx.cc" ],
- whole_static_libs: [ "libaptx_enc" ],
+ srcs: ["src/aptx.cc"],
+ whole_static_libs: ["libaptx_enc"],
sanitize: {
address: true,
cfi: true,
@@ -36,8 +36,8 @@ cc_test {
test_options: {
unit_test: true,
},
- srcs: [ "src/aptxhd.cc" ],
- whole_static_libs: [ "libaptxhd_enc" ],
+ srcs: ["src/aptxhd.cc"],
+ whole_static_libs: ["libaptxhd_enc"],
sanitize: {
address: true,
cfi: true,
diff --git a/system/gd/Android.bp b/system/gd/Android.bp
index c95f46405c9..30dba93d45a 100644
--- a/system/gd/Android.bp
+++ b/system/gd/Android.bp
@@ -95,11 +95,11 @@ cc_defaults {
"-google*",
"-performance*",
"-bugprone*",
- "-cert-dcl21-cpp", // warning: overloaded returns a non-constant object instead of a constant object type
- "-cert-dcl59-cpp", // warning: do not use unnamed namespaces in header files
- "-cert-oop54-cpp", // warning: operator=() does not handle self-assignment properly
- "-cert-msc50-cpp", // warning: rand() has limited randomness; use C++11 random library instead
- "-cert-msc30-c", // warning: rand() has limited randomness; use C++11 random library instead
+ "-cert-dcl21-cpp", // warning: overloaded returns a non-constant object instead of a constant object type
+ "-cert-dcl59-cpp", // warning: do not use unnamed namespaces in header files
+ "-cert-oop54-cpp", // warning: operator=() does not handle self-assignment properly
+ "-cert-msc50-cpp", // warning: rand() has limited randomness; use C++11 random library instead
+ "-cert-msc30-c", // warning: rand() has limited randomness; use C++11 random library instead
],
tidy_checks_as_errors: [
"cppcoreguidelines-pro-type-member-init",
@@ -127,7 +127,7 @@ cc_defaults {
tidy_checks: [
"-android-cloexec-pipe2", // warning: 'pipe2' should use O_CLOEXEC where possible
"-android-cloexec-accept", // warning: prefer accept4() to accept() because accept4() allows SOCK_CLOEXEC
- "-android-cloexec-socket", // warning: 'pipe2' should use O_CLOEXEC where possible
+ "-android-cloexec-socket", // warning: 'pipe2' should use O_CLOEXEC where possible
],
}
@@ -221,7 +221,7 @@ cc_defaults {
"packages/modules/Bluetooth/system/include",
"packages/modules/Bluetooth/system/types",
],
- export_static_lib_headers: [ "libbluetooth_rust_interop" ],
+ export_static_lib_headers: ["libbluetooth_rust_interop"],
}
cc_library {
@@ -339,7 +339,7 @@ cc_binary {
sanitize: {
address: true,
cfi: true,
- }
+ },
}
cc_test {
@@ -550,8 +550,8 @@ cc_fuzz {
":BluetoothL2capFuzzTestSources",
],
fuzz_config: {
- cc: ["android-bluetooth-security@google.com"],
- componentid: 27441,
+ cc: ["android-bluetooth-security@google.com"],
+ componentid: 27441,
},
}
@@ -571,8 +571,8 @@ cc_fuzz {
"hci/fuzz/acl_manager_fuzz_test.cc",
],
fuzz_config: {
- cc: ["android-bluetooth-security@google.com"],
- componentid: 27441,
+ cc: ["android-bluetooth-security@google.com"],
+ componentid: 27441,
},
}
@@ -580,7 +580,7 @@ cc_benchmark {
name: "bluetooth_benchmark_gd",
defaults: [
"gd_defaults",
- "libchrome_support_defaults"
+ "libchrome_support_defaults",
],
host_supported: true,
srcs: [
@@ -638,9 +638,12 @@ rust_library {
name: "libbt_packets",
defaults: ["gd_rust_defaults"],
crate_name: "bt_packets",
- srcs: ["rust/packets/lib.rs", ":BluetoothGeneratedPackets_rust"],
+ srcs: [
+ "rust/packets/lib.rs",
+ ":BluetoothGeneratedPackets_rust",
+ ],
edition: "2018",
- vendor_available : true,
+ vendor_available: true,
host_supported: true,
proc_macros: ["libnum_derive"],
rustlibs: [
@@ -659,9 +662,12 @@ rust_library {
name: "libbt_packets_nonapex",
defaults: ["gd_rust_defaults"],
crate_name: "bt_packets",
- srcs: ["rust/packets/lib.rs", ":BluetoothGeneratedPackets_rust"],
+ srcs: [
+ "rust/packets/lib.rs",
+ ":BluetoothGeneratedPackets_rust",
+ ],
edition: "2018",
- vendor_available : true,
+ vendor_available: true,
host_supported: true,
proc_macros: ["libnum_derive"],
rustlibs: [
@@ -679,7 +685,10 @@ rust_test_host {
"gd_rust_defaults",
"mts_defaults",
],
- srcs: ["rust/packets/lib.rs", ":BluetoothGeneratedPackets_rust"],
+ srcs: [
+ "rust/packets/lib.rs",
+ ":BluetoothGeneratedPackets_rust",
+ ],
test_suites: ["general-tests"],
edition: "2018",
proc_macros: ["libnum_derive"],
@@ -712,7 +721,10 @@ rust_test_host {
"gd_rust_defaults",
"mts_defaults",
],
- srcs: ["rust/packets/test_lib.rs", ":TestGeneratedPackets_rust"],
+ srcs: [
+ "rust/packets/test_lib.rs",
+ ":TestGeneratedPackets_rust",
+ ],
test_suites: ["general-tests"],
edition: "2018",
proc_macros: ["libnum_derive"],
@@ -924,15 +936,14 @@ cc_library_host_shared {
// hci_packets.pdl.
genrule {
name: "gd_hci_packets_python3_gen",
- defaults: [ "pdl_python_generator_defaults" ],
+ defaults: ["pdl_python_generator_defaults"],
cmd: "$(location :pdl) $(in) |" +
" $(location :pdl_python_generator)" +
" --output $(out) --custom-type-location blueberry.utils.bluetooth",
srcs: [
":BluetoothHciPackets",
],
- out: [
+ out: [
"hci_packets.py",
],
}
-
diff --git a/system/gd/common/testing/Android.bp b/system/gd/common/testing/Android.bp
index f72aee547c3..a4c795dc69d 100644
--- a/system/gd/common/testing/Android.bp
+++ b/system/gd/common/testing/Android.bp
@@ -10,27 +10,27 @@ package {
filegroup {
name: "BluetoothAndroidTestingLogCapture",
srcs: [
- "android/log_capture.cc",
- ],
+ "android/log_capture.cc",
+ ],
}
filegroup {
name: "BluetoothAndroidTestingLogCaptureTest",
srcs: [
- "android/log_capture_test.cc",
+ "android/log_capture_test.cc",
],
}
filegroup {
name: "BluetoothHostTestingLogCapture",
srcs: [
- "host/log_capture.cc",
- ],
+ "host/log_capture.cc",
+ ],
}
filegroup {
name: "BluetoothHostTestingLogCaptureTest",
srcs: [
- "host/log_capture_test.cc",
+ "host/log_capture_test.cc",
],
}
diff --git a/system/gd/crypto_toolbox/Android.bp b/system/gd/crypto_toolbox/Android.bp
index c89a0a9bc88..671508d37b0 100644
--- a/system/gd/crypto_toolbox/Android.bp
+++ b/system/gd/crypto_toolbox/Android.bp
@@ -14,12 +14,12 @@ filegroup {
"aes.cc",
"aes_cmac.cc",
"crypto_toolbox.cc",
- ]
+ ],
}
filegroup {
name: "BluetoothCryptoToolboxTestSources",
srcs: [
"crypto_toolbox_test.cc",
- ]
+ ],
}
diff --git a/system/gd/dumpsys/Android.bp b/system/gd/dumpsys/Android.bp
index a9f04b8c005..d644a7d52d2 100644
--- a/system/gd/dumpsys/Android.bp
+++ b/system/gd/dumpsys/Android.bp
@@ -83,7 +83,7 @@ genrule {
":BluetoothGeneratedDumpsysBinarySchema_bfbs",
],
out: [
- "dumpsys_module_schema_data.cc",
+ "dumpsys_module_schema_data.cc",
],
}
@@ -91,14 +91,14 @@ genrule {
name: "BluetoothGeneratedDumpsysBundledSchema_cc",
visibility: ["//visibility:private"],
tools: [
- "bluetooth_flatbuffer_bundler",
+ "bluetooth_flatbuffer_bundler",
],
cmd: "$(location bluetooth_flatbuffer_bundler) -w -m bluetooth.DumpsysData -f generated_dumpsys_bundled_schema -n bluetooth::dumpsys -g $(genDir) $(locations :BluetoothGeneratedDumpsysBinarySchema_bfbs)",
srcs: [
":BluetoothGeneratedDumpsysBinarySchema_bfbs",
],
out: [
- "generated_dumpsys_bundled_schema.cc",
+ "generated_dumpsys_bundled_schema.cc",
],
}
@@ -106,14 +106,14 @@ genrule {
name: "BluetoothGeneratedDumpsysBundledTestSchema_cc",
visibility: ["//visibility:private"],
tools: [
- "bluetooth_flatbuffer_bundler",
+ "bluetooth_flatbuffer_bundler",
],
cmd: "$(location bluetooth_flatbuffer_bundler) -w -m testing.DumpsysTestDataRoot -f generated_dumpsys_bundled_test_schema -n testing -g $(genDir) $(locations :BluetoothGeneratedDumpsysTestData_bfbs)",
srcs: [
":BluetoothGeneratedDumpsysTestData_bfbs",
],
out: [
- "generated_dumpsys_bundled_test_schema.cc",
+ "generated_dumpsys_bundled_test_schema.cc",
],
}
@@ -127,7 +127,8 @@ genrule {
"bluetooth_flatbuffer_test.fbs",
],
out: [
- "bluetooth_flatbuffer_test_generated.h", "bluetooth_flatbuffer_test.bfbs",
+ "bluetooth_flatbuffer_test_generated.h",
+ "bluetooth_flatbuffer_test.bfbs",
],
}
@@ -158,7 +159,7 @@ cc_library {
],
generated_sources: [
"BluetoothGeneratedDumpsysBundledTestSchema_cc",
- ],
+ ],
}
cc_library {
@@ -171,13 +172,16 @@ cc_library {
],
generated_headers: [
"BluetoothGeneratedDumpsysTestSchema_cc",
- ],
+ ],
}
cc_test {
name: "bluetooth_flatbuffer_tests",
test_suites: ["device-tests"],
- defaults: ["fluoride_common_options", "mts_defaults"],
+ defaults: [
+ "fluoride_common_options",
+ "mts_defaults",
+ ],
host_supported: true,
test_options: {
unit_test: true,
diff --git a/system/gd/dumpsys/bundler/Android.bp b/system/gd/dumpsys/bundler/Android.bp
index 542c7c49fdb..331f9256dc9 100644
--- a/system/gd/dumpsys/bundler/Android.bp
+++ b/system/gd/dumpsys/bundler/Android.bp
@@ -41,7 +41,8 @@ genrule {
"bundler_schema.fbs",
],
out: [
- "bundler_schema_generated.h", "bundler_schema.bfbs",
+ "bundler_schema_generated.h",
+ "bundler_schema.bfbs",
],
}
diff --git a/system/gd/hci/Android.bp b/system/gd/hci/Android.bp
index 74efb8c88c8..88c0dd233eb 100644
--- a/system/gd/hci/Android.bp
+++ b/system/gd/hci/Android.bp
@@ -107,5 +107,5 @@ filegroup {
name: "BluetoothHciPackets",
srcs: [
"hci_packets.pdl",
- ]
+ ],
}
diff --git a/system/gd/iso/Android.bp b/system/gd/iso/Android.bp
index 6d07c39f3c7..fabab23b285 100644
--- a/system/gd/iso/Android.bp
+++ b/system/gd/iso/Android.bp
@@ -10,9 +10,9 @@ package {
filegroup {
name: "BluetoothIsoSources",
srcs: [
- "iso_manager.cc",
- "iso_module.cc",
- "internal/iso_manager_impl.cc",
+ "iso_manager.cc",
+ "iso_module.cc",
+ "internal/iso_manager_impl.cc",
],
}
diff --git a/system/gd/l2cap/fuzz/Android.bp b/system/gd/l2cap/fuzz/Android.bp
index 1b7ea2cfe0f..179c46e833e 100644
--- a/system/gd/l2cap/fuzz/Android.bp
+++ b/system/gd/l2cap/fuzz/Android.bp
@@ -40,7 +40,7 @@ cc_fuzz {
"libbte",
],
fuzz_config: {
- cc: ["android-bluetooth-security@google.com"],
- componentid: 27441,
+ cc: ["android-bluetooth-security@google.com"],
+ componentid: 27441,
},
}
diff --git a/system/gd/neighbor/Android.bp b/system/gd/neighbor/Android.bp
index 80ba7d25edb..267a3f3a02d 100644
--- a/system/gd/neighbor/Android.bp
+++ b/system/gd/neighbor/Android.bp
@@ -10,19 +10,19 @@ package {
filegroup {
name: "BluetoothNeighborSources",
srcs: [
- "connectability.cc",
- "discoverability.cc",
- "inquiry.cc",
- "name_db.cc",
- "page.cc",
- "scan.cc",
+ "connectability.cc",
+ "discoverability.cc",
+ "inquiry.cc",
+ "name_db.cc",
+ "page.cc",
+ "scan.cc",
],
}
filegroup {
name: "BluetoothNeighborTestSources",
srcs: [
- "inquiry_test.cc",
+ "inquiry_test.cc",
],
}
diff --git a/system/gd/os/Android.bp b/system/gd/os/Android.bp
index 36aefdbc11a..25f34ecfb31 100644
--- a/system/gd/os/Android.bp
+++ b/system/gd/os/Android.bp
@@ -56,7 +56,6 @@ filegroup {
],
}
-
filegroup {
name: "BluetoothOsSources_linux_generic",
srcs: [
@@ -84,11 +83,11 @@ filegroup {
}
filegroup {
-name: "BluetoothOsBenchmarkSources",
- srcs: [
- "alarm_benchmark.cc",
- "thread_benchmark.cc",
- "queue_benchmark.cc",
+ name: "BluetoothOsBenchmarkSources",
+ srcs: [
+ "alarm_benchmark.cc",
+ "thread_benchmark.cc",
+ "queue_benchmark.cc",
],
}
diff --git a/system/gd/rust/common/Android.bp b/system/gd/rust/common/Android.bp
index e60f145f0ee..5905108abc9 100644
--- a/system/gd/rust/common/Android.bp
+++ b/system/gd/rust/common/Android.bp
@@ -7,39 +7,38 @@ package {
default_applicable_licenses: ["system_bt_license"],
}
-
rust_library {
- name : "libbt_common",
- defaults: ["libbt_common_defaults"],
- rustlibs: [
- "libtokio",
- "libnix",
- "liblazy_static",
- "liblog_rust",
- "libcxx",
- "libgrpcio",
- ],
- target: {
- android: {
- rustlibs: [
- "libandroid_logger",
- "librustutils",
- ],
- shared_libs: [
- "libcutils",
- ],
- },
- host: {
- rustlibs: [
- "libenv_logger",
- ],
- },
- },
- apex_available: [
- "//apex_available:platform",
- "com.android.btservices",
- ],
- min_sdk_version: "Tiramisu",
+ name: "libbt_common",
+ defaults: ["libbt_common_defaults"],
+ rustlibs: [
+ "libtokio",
+ "libnix",
+ "liblazy_static",
+ "liblog_rust",
+ "libcxx",
+ "libgrpcio",
+ ],
+ target: {
+ android: {
+ rustlibs: [
+ "libandroid_logger",
+ "librustutils",
+ ],
+ shared_libs: [
+ "libcutils",
+ ],
+ },
+ host: {
+ rustlibs: [
+ "libenv_logger",
+ ],
+ },
+ },
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.btservices",
+ ],
+ min_sdk_version: "Tiramisu",
}
rust_defaults {
@@ -74,13 +73,13 @@ rust_ffi_static {
name: "libbt_common_ffi",
defaults: ["libbt_common_defaults"],
target: {
- android: {
- rustlibs: [
- "librustutils",
- "libandroid_logger",
- ]
- },
- },
+ android: {
+ rustlibs: [
+ "librustutils",
+ "libandroid_logger",
+ ],
+ },
+ },
apex_available: [
"com.android.btservices",
],
@@ -121,13 +120,18 @@ cc_library_static {
min_sdk_version: "30",
}
-
cc_library_static {
name: "libbt_keystore_cc",
- defaults: ["rust_static_cc_lib_defaults", "gd_ffi_defaults"],
+ defaults: [
+ "rust_static_cc_lib_defaults",
+ "gd_ffi_defaults",
+ ],
header_libs: ["libbt_keystore_cc_headers"],
srcs: ["keystore/fake_bt_keystore.cc"],
- generated_headers: ["libbt_common_bridge_header", "cxx-bridge-header"],
+ generated_headers: [
+ "libbt_common_bridge_header",
+ "cxx-bridge-header",
+ ],
generated_sources: ["libbt_common_bridge_code"],
shared_libs: [
"libchrome",
diff --git a/system/gd/rust/facade/Android.bp b/system/gd/rust/facade/Android.bp
index b7b87a38f75..a79b958ba89 100644
--- a/system/gd/rust/facade/Android.bp
+++ b/system/gd/rust/facade/Android.bp
@@ -14,14 +14,14 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
- "libbluetooth_rs",
- "libbt_facade_proto",
- "libfutures",
- "libgrpcio",
- "libprotobuf",
- "libtokio",
- "libgddi",
- "liblog_rust",
+ "libbluetooth_rs",
+ "libbt_facade_proto",
+ "libfutures",
+ "libgrpcio",
+ "libprotobuf",
+ "libtokio",
+ "libgddi",
+ "liblog_rust",
],
}
@@ -31,15 +31,15 @@ rust_binary {
srcs: ["src/main.rs"],
edition: "2018",
rustlibs: [
- "libclap",
- "libbluetooth_with_facades",
- "libfutures",
- "libgrpcio",
- "liblazy_static",
- "libtokio",
- "libnix",
- "libbt_common",
- "liblog_rust",
+ "libclap",
+ "libbluetooth_with_facades",
+ "libfutures",
+ "libgrpcio",
+ "liblazy_static",
+ "libtokio",
+ "libnix",
+ "libbt_common",
+ "liblog_rust",
],
}
@@ -49,15 +49,15 @@ rust_test {
srcs: ["src/main.rs"],
edition: "2018",
rustlibs: [
- "libclap",
- "libbluetooth_with_facades",
- "libfutures",
- "libgrpcio",
- "liblazy_static",
- "libtokio",
- "libnix",
- "libbt_common",
- "liblog_rust",
+ "libclap",
+ "libbluetooth_with_facades",
+ "libfutures",
+ "libgrpcio",
+ "liblazy_static",
+ "libtokio",
+ "libnix",
+ "libbt_common",
+ "liblog_rust",
],
test_suites: ["general-tests"],
}
diff --git a/system/gd/rust/shim/Android.bp b/system/gd/rust/shim/Android.bp
index 23fdeba7f69..700b0cb4910 100644
--- a/system/gd/rust/shim/Android.bp
+++ b/system/gd/rust/shim/Android.bp
@@ -70,7 +70,7 @@ cc_library_static {
name: "libbt_shim_bridge",
defaults: [
"gd_ffi_defaults",
- "libchrome_support_defaults"
+ "libchrome_support_defaults",
],
generated_headers: [
"libbt_init_flags_bridge_header",
@@ -108,7 +108,7 @@ cc_library_static {
name: "libbluetooth_rust_interop",
defaults: [
"gd_ffi_defaults",
- "libchrome_support_defaults"
+ "libchrome_support_defaults",
],
static_libs: [
"libbt_shim_bridge",
@@ -125,11 +125,14 @@ cc_library_static {
name: "libbt_callbacks_cxx",
defaults: [
"gd_ffi_defaults",
- "libchrome_support_defaults"
+ "libchrome_support_defaults",
],
header_libs: ["libbt_callbacks_cxx_headers"],
srcs: ["callbacks/callbacks.cc"],
- generated_headers: ["libbt_shim_bridge_header", "cxx-bridge-header"],
+ generated_headers: [
+ "libbt_shim_bridge_header",
+ "cxx-bridge-header",
+ ],
host_supported: true,
apex_available: [
"com.android.btservices",
diff --git a/system/gd/rust/stack/Android.bp b/system/gd/rust/stack/Android.bp
index 675c3bb1e50..1f3f0597eb3 100644
--- a/system/gd/rust/stack/Android.bp
+++ b/system/gd/rust/stack/Android.bp
@@ -111,7 +111,10 @@ cc_library_static {
srcs: ["src/hal/ffi/hidl.cc"],
local_include_dirs: ["src/hal/ffi"],
include_dirs: ["packages/modules/Bluetooth/system"],
- generated_headers: ["libbt_hidl_hal_bridge_header", "cxx-bridge-header"],
+ generated_headers: [
+ "libbt_hidl_hal_bridge_header",
+ "cxx-bridge-header",
+ ],
generated_sources: ["libbt_hidl_hal_bridge_code"],
shared_libs: [
"android.hardware.bluetooth@1.0",
@@ -124,4 +127,3 @@ cc_library_static {
],
min_sdk_version: "30",
}
-
diff --git a/system/gd/rust/topshim/Android.bp b/system/gd/rust/topshim/Android.bp
index 7ca598ee111..ac3521b762d 100644
--- a/system/gd/rust/topshim/Android.bp
+++ b/system/gd/rust/topshim/Android.bp
@@ -60,7 +60,7 @@ cc_library_static {
generated_headers: [
"libbt_init_flags_bridge_header",
"libbt_topshim_bridge_header",
- "cxx-bridge-header"
+ "cxx-bridge-header",
],
generated_sources: ["libbt_topshim_bridge_code"],
include_dirs: [
diff --git a/system/gd/rust/topshim/facade/Android.bp b/system/gd/rust/topshim/facade/Android.bp
index dcabb6c84ea..5f59a9839e4 100644
--- a/system/gd/rust/topshim/facade/Android.bp
+++ b/system/gd/rust/topshim/facade/Android.bp
@@ -11,11 +11,14 @@ rust_defaults {
name: "bt_topshim_facade.defaults",
defaults: [
"gd_rust_defaults",
- "libchrome_support_defaults"
+ "libchrome_support_defaults",
],
crate_name: "bt_topshim_facade",
srcs: ["src/main.rs"],
- ld_flags: ["-fsanitize=undefined", "-fsanitize-minimal-runtime"],
+ ld_flags: [
+ "-fsanitize=undefined",
+ "-fsanitize-minimal-runtime",
+ ],
rustlibs: [
"libbluetooth_rs",
"libbt_common",
@@ -78,7 +81,7 @@ rust_defaults {
"liblog",
"libcutils",
"libgrpc++",
- "libgrpc_wrap"
+ "libgrpc_wrap",
],
proc_macros: [
"libpaste",
diff --git a/system/gd/security/Android.bp b/system/gd/security/Android.bp
index 17ab2b90148..b8ffc43993b 100644
--- a/system/gd/security/Android.bp
+++ b/system/gd/security/Android.bp
@@ -48,8 +48,8 @@ filegroup {
}
filegroup {
- name: "BluetoothFacade_security_layer",
- srcs: [
- "facade.cc",
- ],
+ name: "BluetoothFacade_security_layer",
+ srcs: [
+ "facade.cc",
+ ],
}
diff --git a/system/gd/security/channel/Android.bp b/system/gd/security/channel/Android.bp
index 9b069a0f2df..d005b22dd04 100644
--- a/system/gd/security/channel/Android.bp
+++ b/system/gd/security/channel/Android.bp
@@ -11,12 +11,12 @@ filegroup {
name: "BluetoothSecurityChannelSources",
srcs: [
"security_manager_channel.cc",
- ]
+ ],
}
filegroup {
name: "BluetoothSecurityChannelTestSources",
srcs: [
"security_manager_channel_unittest.cc",
- ]
+ ],
}
diff --git a/system/gd/security/pairing/Android.bp b/system/gd/security/pairing/Android.bp
index ad5f32b7e00..20e5e331f9e 100644
--- a/system/gd/security/pairing/Android.bp
+++ b/system/gd/security/pairing/Android.bp
@@ -11,12 +11,12 @@ filegroup {
name: "BluetoothSecurityPairingSources",
srcs: [
"classic_pairing_handler.cc",
- ]
+ ],
}
filegroup {
name: "BluetoothSecurityPairingTestSources",
srcs: [
"classic_pairing_handler_unittest.cc",
- ]
+ ],
}
diff --git a/system/gd/security/record/Android.bp b/system/gd/security/record/Android.bp
index 76334644e12..1fb0c8504e2 100644
--- a/system/gd/security/record/Android.bp
+++ b/system/gd/security/record/Android.bp
@@ -10,13 +10,13 @@ package {
filegroup {
name: "BluetoothSecurityRecordSources",
srcs: [
- "security_record_storage.cc"
+ "security_record_storage.cc",
],
}
filegroup {
name: "BluetoothSecurityRecordTestSources",
srcs: [
- "security_record_storage_test.cc"
+ "security_record_storage_test.cc",
],
}
diff --git a/system/gd/shim/Android.bp b/system/gd/shim/Android.bp
index 48293bd4844..838eaa4583a 100644
--- a/system/gd/shim/Android.bp
+++ b/system/gd/shim/Android.bp
@@ -10,16 +10,16 @@ package {
filegroup {
name: "BluetoothShimSources",
srcs: [
- "dumpsys.cc",
- "dumpsys_args.cc",
- ]
+ "dumpsys.cc",
+ "dumpsys_args.cc",
+ ],
}
filegroup {
name: "BluetoothShimTestSources",
srcs: [
- "dumpsys_test.cc",
- "dumpsys_args_test.cc",
+ "dumpsys_test.cc",
+ "dumpsys_args_test.cc",
],
}
diff --git a/system/gd/storage/Android.bp b/system/gd/storage/Android.bp
index 6644da1d433..116dd146d1a 100644
--- a/system/gd/storage/Android.bp
+++ b/system/gd/storage/Android.bp
@@ -10,36 +10,36 @@ package {
filegroup {
name: "BluetoothStorageSources",
srcs: [
- "adapter_config.cc",
- "classic_device.cc",
- "config_cache.cc",
- "config_cache_helper.cc",
- "device.cc",
- "le_device.cc",
- "legacy_config_file.cc",
- "mutation.cc",
- "mutation_entry.cc",
- "storage_module.cc",
+ "adapter_config.cc",
+ "classic_device.cc",
+ "config_cache.cc",
+ "config_cache_helper.cc",
+ "device.cc",
+ "le_device.cc",
+ "legacy_config_file.cc",
+ "mutation.cc",
+ "mutation_entry.cc",
+ "storage_module.cc",
],
}
filegroup {
name: "BluetoothStorageUnitTestSources",
srcs: [
- "adapter_config_test.cc",
- "classic_device_test.cc",
- "config_cache_test.cc",
- "config_cache_helper_test.cc",
- "device_test.cc",
- "le_device_test.cc",
- "legacy_config_file_test.cc",
- "mutation_test.cc",
+ "adapter_config_test.cc",
+ "classic_device_test.cc",
+ "config_cache_test.cc",
+ "config_cache_helper_test.cc",
+ "device_test.cc",
+ "le_device_test.cc",
+ "legacy_config_file_test.cc",
+ "mutation_test.cc",
],
}
filegroup {
name: "BluetoothStorageTestSources",
srcs: [
- "storage_module_test.cc",
+ "storage_module_test.cc",
],
}
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 529794f3045..3e41526a351 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -55,7 +55,7 @@ cc_library_static {
},
},
host_supported: true,
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
// HCI unit tests for target
@@ -116,4 +116,3 @@ cc_test {
"test/packet_fragmenter_host_test.cc",
],
}
-
diff --git a/system/include/Android.bp b/system/include/Android.bp
index 7c8337109d6..0665fc4b251 100644
--- a/system/include/Android.bp
+++ b/system/include/Android.bp
@@ -30,7 +30,7 @@ cc_library_headers {
cc_library_headers {
name: "libbluetooth_headers",
defaults: ["libchrome_support_defaults"],
- visibility:[
+ visibility: [
"//packages/apps/Test/connectivity/sl4n",
"//packages/modules/Bluetooth:__subpackages__",
"//vendor:__subpackages__",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 9dfa69d9395..287970e79b3 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -16,7 +16,7 @@ filegroup {
"bte_logmsg.cc",
"bte_main.cc",
"stack_config.cc",
- ]
+ ],
}
cc_library_static {
@@ -56,7 +56,7 @@ cc_library_static {
],
header_libs: ["libbt_callbacks_cxx_headers"],
host_supported: true,
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
cc_library {
@@ -216,7 +216,7 @@ cc_test {
integer_overflow: true,
scs: true,
diag: {
- undefined : true
+ undefined: true,
},
},
generated_headers: [
@@ -224,5 +224,5 @@ cc_test {
"BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
diff --git a/system/main/shim/Android.bp b/system/main/shim/Android.bp
index ba99de874ad..173ed49c39c 100644
--- a/system/main/shim/Android.bp
+++ b/system/main/shim/Android.bp
@@ -29,5 +29,5 @@ filegroup {
"metrics_api.cc",
"shim.cc",
"stack.cc",
- ]
+ ],
}
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 7d3b5ef041e..d401b536334 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -46,16 +46,16 @@ cc_test_library {
}
filegroup {
- name: "OsiCompatSources",
- srcs: [
- "src/compat.cc",
- ],
+ name: "OsiCompatSources",
+ srcs: [
+ "src/compat.cc",
+ ],
}
// libosi static library for target
cc_library_static {
name: "libosi",
- visibility:[
+ visibility: [
"//packages/apps/Test/connectivity/sl4n",
"//packages/modules/Bluetooth:__subpackages__",
],
@@ -65,7 +65,10 @@ cc_library_static {
local_include_dirs: [
"include_internal",
],
- defaults: ["fluoride_osi_defaults", "fluoride_basic_defaults"],
+ defaults: [
+ "fluoride_osi_defaults",
+ "fluoride_basic_defaults",
+ ],
// TODO(mcchou): Remove socket_utils sources after platform specific
// dependencies are abstracted.
srcs: [
diff --git a/system/osi/test/fuzzers/alarm/Android.bp b/system/osi/test/fuzzers/alarm/Android.bp
index 34128245955..f26951ec109 100644
--- a/system/osi/test/fuzzers/alarm/Android.bp
+++ b/system/osi/test/fuzzers/alarm/Android.bp
@@ -26,5 +26,5 @@ cc_fuzz {
"libgmock",
"libosi",
],
- cflags: [ "-Wno-unused-function" ],
+ cflags: ["-Wno-unused-function"],
}
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index f1121b60081..83e8bde1a12 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -38,7 +38,7 @@ cc_library_static {
apex_available: [
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
cc_test {
diff --git a/system/rust/Android.bp b/system/rust/Android.bp
index ef775e464d1..f72810854f7 100644
--- a/system/rust/Android.bp
+++ b/system/rust/Android.bp
@@ -13,9 +13,12 @@ rust_defaults {
dylib: {
enabled: false,
},
- srcs: ["src/lib.rs", ":bluetooth_core_rust_packets"],
+ srcs: [
+ "src/lib.rs",
+ ":bluetooth_core_rust_packets",
+ ],
shared_libs: [
- "libbase",
+ "libbase",
],
static_libs: [
"libbluetooth-core",
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index da1f2ae1cf2..a10c1f6c5dd 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -21,7 +21,7 @@ cc_test_library {
include_dirs: [
"packages/modules/Bluetooth/system",
],
- srcs: crypto_toolbox_srcs
+ srcs: crypto_toolbox_srcs,
}
// Bluetooth stack static library for target
@@ -143,19 +143,19 @@ cc_library_static {
"libaptxhd_enc",
],
host_supported: true,
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
filegroup {
- name: "LegacyStackSdp",
- srcs: [
+ name: "LegacyStackSdp",
+ srcs: [
"sdp/sdp_api.cc",
"sdp/sdp_db.cc",
"sdp/sdp_discovery.cc",
"sdp/sdp_main.cc",
"sdp/sdp_server.cc",
"sdp/sdp_utils.cc",
- ],
+ ],
}
cc_library_static {
@@ -286,7 +286,7 @@ cc_library_static {
"libbt-hci",
],
host_supported: true,
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
// Bluetooth stack unit tests for target
@@ -362,7 +362,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -436,7 +436,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -506,7 +506,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -553,7 +553,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -586,7 +586,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -631,7 +631,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -686,7 +686,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -747,7 +747,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -787,7 +787,7 @@ cc_test {
":BluetoothAndroidTestingLogCapture",
],
test_config: "test/a2dp/AndroidTest.xml",
- }
+ },
},
data: [
"test/a2dp/raw_data/*",
@@ -895,7 +895,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -943,7 +943,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -974,7 +974,7 @@ cc_test {
"test/common/mock_controller.cc",
"test/common/mock_gatt_layer.cc",
"test/common/mock_hcic_layer.cc",
- ":TestCommonStackConfig"
+ ":TestCommonStackConfig",
],
static_libs: [
"libbt-common",
@@ -989,13 +989,13 @@ cc_test {
all_undefined: true,
integer_overflow: true,
diag: {
- undefined : true
+ undefined: true,
},
},
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -1020,10 +1020,10 @@ cc_test {
"l2cap",
"test/common",
],
- include_dirs:[
+ include_dirs: [
"packages/modules/Bluetooth/system",
"packages/modules/Bluetooth/system/gd",
- "packages/modules/Bluetooth/system/internal_include"
+ "packages/modules/Bluetooth/system/internal_include",
],
srcs: [
"eatt/eatt.cc",
@@ -1055,7 +1055,7 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -1167,13 +1167,13 @@ cc_test {
integer_overflow: true,
scs: true,
diag: {
- undefined : true
+ undefined: true,
},
},
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -1218,13 +1218,13 @@ cc_test {
integer_overflow: true,
scs: true,
diag: {
- undefined : true
+ undefined: true,
},
},
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -1278,13 +1278,13 @@ cc_test {
integer_overflow: true,
scs: true,
diag: {
- undefined : true
+ undefined: true,
},
},
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -1347,13 +1347,13 @@ cc_test {
integer_overflow: true,
scs: true,
diag: {
- undefined : true
+ undefined: true,
},
},
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -1432,13 +1432,13 @@ cc_test {
integer_overflow: true,
scs: true,
diag: {
- undefined : true
+ undefined: true,
},
},
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -1511,7 +1511,7 @@ cc_test {
integer_overflow: true,
scs: true,
diag: {
- undefined : true
+ undefined: true,
},
},
}
@@ -1584,13 +1584,13 @@ cc_test {
integer_overflow: true,
scs: true,
diag: {
- undefined : true
+ undefined: true,
},
},
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
@@ -1639,6 +1639,6 @@ cc_test {
target: {
android: {
test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- }
+ },
},
}
diff --git a/system/test/Android.bp b/system/test/Android.bp
index 355fa3f0f97..0573b08074f 100644
--- a/system/test/Android.bp
+++ b/system/test/Android.bp
@@ -15,492 +15,492 @@ subdirs = [
filegroup {
name: "TestMockBtaAg",
srcs: [
- "mock/mock_bta_ag_*.cc",
+ "mock/mock_bta_ag_*.cc",
],
}
filegroup {
name: "TestMockBtaAr",
srcs: [
- "mock/mock_bta_ar.cc",
+ "mock/mock_bta_ar.cc",
],
}
filegroup {
name: "TestMockBtaAv",
srcs: [
- "mock/mock_bta_av_*.cc",
+ "mock/mock_bta_av_*.cc",
],
}
filegroup {
name: "TestMockBtaCsis",
srcs: [
- "mock/mock_bta_csis*.cc",
+ "mock/mock_bta_csis*.cc",
],
}
filegroup {
name: "TestMockBtaDm",
srcs: [
- "mock/mock_bta_dm_*.cc",
+ "mock/mock_bta_dm_*.cc",
],
}
filegroup {
name: "TestMockBtaGatt",
srcs: [
- "mock/mock_bta_gatt*.cc",
+ "mock/mock_bta_gatt*.cc",
],
}
filegroup {
name: "TestMockBtaGroups",
srcs: [
- "mock/mock_bta_groups*.cc",
+ "mock/mock_bta_groups*.cc",
],
}
filegroup {
name: "TestMockBtaHas",
srcs: [
- "mock/mock_bta_has.cc",
+ "mock/mock_bta_has.cc",
],
}
filegroup {
name: "TestMockBtaHd",
srcs: [
- "mock/mock_bta_hd*.cc",
+ "mock/mock_bta_hd*.cc",
],
}
filegroup {
name: "TestMockBtaHearingAid",
srcs: [
- "mock/mock_bta_hearing_aid.cc",
+ "mock/mock_bta_hearing_aid.cc",
],
}
filegroup {
name: "TestMockBtaHf",
srcs: [
- "mock/mock_bta_hf*.cc",
+ "mock/mock_bta_hf*.cc",
],
}
filegroup {
name: "TestMockBtaHh",
srcs: [
- "mock/mock_bta_hh*.cc",
+ "mock/mock_bta_hh*.cc",
],
}
filegroup {
name: "TestMockBtaJv",
srcs: [
- "mock/mock_bta_jv_*.cc",
+ "mock/mock_bta_jv_*.cc",
],
}
filegroup {
name: "TestMockBtaLeAudio",
srcs: [
- "mock/mock_bta_leaudio*.cc",
+ "mock/mock_bta_leaudio*.cc",
],
}
filegroup {
- name: "TestMockBtaLeAudioHalVerifier",
- srcs: [
- "mock/mock_le_audio_hal_verifier.cc",
- ],
+ name: "TestMockBtaLeAudioHalVerifier",
+ srcs: [
+ "mock/mock_le_audio_hal_verifier.cc",
+ ],
}
filegroup {
name: "TestMockBtaPan",
srcs: [
- "mock/mock_bta_pan_*.cc",
+ "mock/mock_bta_pan_*.cc",
],
}
filegroup {
name: "TestMockBtaSdp",
srcs: [
- "mock/mock_bta_sdp_*.cc",
+ "mock/mock_bta_sdp_*.cc",
],
}
filegroup {
name: "TestMockBtaSys",
srcs: [
- "mock/mock_bta_sys_*.cc",
+ "mock/mock_bta_sys_*.cc",
],
}
filegroup {
name: "TestMockBtaVc",
srcs: [
- "mock/mock_bta_vc*.cc",
+ "mock/mock_bta_vc*.cc",
],
}
filegroup {
name: "TestMockBta",
srcs: [
- ":TestMockBtaAg",
- ":TestMockBtaAr",
- ":TestMockBtaAv",
- ":TestMockBtaCsis",
- ":TestMockBtaDm",
- ":TestMockBtaGatt",
- ":TestMockBtaGroups",
- ":TestMockBtaHas",
- ":TestMockBtaHd",
- ":TestMockBtaHearingAid",
- ":TestMockBtaHf",
- ":TestMockBtaHh",
- ":TestMockBtaJv",
- ":TestMockBtaLeAudio",
- ":TestMockBtaLeAudioHalVerifier",
- ":TestMockBtaPan",
- ":TestMockBtaSdp",
- ":TestMockBtaSys",
- ":TestMockBtaVc",
+ ":TestMockBtaAg",
+ ":TestMockBtaAr",
+ ":TestMockBtaAv",
+ ":TestMockBtaCsis",
+ ":TestMockBtaDm",
+ ":TestMockBtaGatt",
+ ":TestMockBtaGroups",
+ ":TestMockBtaHas",
+ ":TestMockBtaHd",
+ ":TestMockBtaHearingAid",
+ ":TestMockBtaHf",
+ ":TestMockBtaHh",
+ ":TestMockBtaJv",
+ ":TestMockBtaLeAudio",
+ ":TestMockBtaLeAudioHalVerifier",
+ ":TestMockBtaPan",
+ ":TestMockBtaSdp",
+ ":TestMockBtaSys",
+ ":TestMockBtaVc",
],
}
filegroup {
name: "TestMockMainShim",
srcs: [
- "mock/mock_main_shim*.cc",
+ "mock/mock_main_shim*.cc",
],
}
filegroup {
name: "TestMockCommon",
srcs: [
- "mock/mock_common_*.cc",
+ "mock/mock_common_*.cc",
],
}
filegroup {
name: "TestMockStackA2dp",
srcs: [
- "mock/mock_stack_a2dp_*.cc",
+ "mock/mock_stack_a2dp_*.cc",
],
}
filegroup {
name: "TestMockStackA2dpApi",
srcs: [
- "mock/mock_stack_a2dp_api.cc",
+ "mock/mock_stack_a2dp_api.cc",
],
}
filegroup {
name: "TestMockStackArbiter",
srcs: [
- "mock/mock_stack_arbiter_*.cc",
+ "mock/mock_stack_arbiter_*.cc",
],
}
filegroup {
name: "TestMockStackL2cap",
srcs: [
- "mock/mock_stack_l2cap_*.cc",
+ "mock/mock_stack_l2cap_*.cc",
],
}
filegroup {
name: "TestMockStackRfcomm",
srcs: [
- "mock/mock_stack_rfcomm*.cc",
+ "mock/mock_stack_rfcomm*.cc",
],
}
filegroup {
name: "TestMockStack",
srcs: [
- "mock/mock_stack_*.cc",
+ "mock/mock_stack_*.cc",
],
}
filegroup {
name: "TestMockHci",
srcs: [
- "mock/mock_hci_*.cc",
+ "mock/mock_hci_*.cc",
],
}
filegroup {
name: "TestMockFrameworks",
srcs: [
- "mock/mock_frameworks_*.cc",
+ "mock/mock_frameworks_*.cc",
],
}
filegroup {
name: "TestMockBtcore",
srcs: [
- "mock/mock_btcore_*.cc",
+ "mock/mock_btcore_*.cc",
],
}
filegroup {
name: "TestMockSystemLibfmq",
srcs: [
- "mock/mock_system_libfmq_*.cc",
+ "mock/mock_system_libfmq_*.cc",
],
}
filegroup {
name: "TestMockUdrv",
srcs: [
- "mock/mock_udrv_*.cc",
+ "mock/mock_udrv_*.cc",
],
}
filegroup {
name: "TestMockAndroidHardware",
srcs: [
- "mock/mock_android_hardware_*.cc",
+ "mock/mock_android_hardware_*.cc",
],
}
filegroup {
name: "TestMockDevice",
srcs: [
- "mock/mock_device_*.cc",
+ "mock/mock_device_*.cc",
],
}
filegroup {
name: "TestMockLegacyHciCommands",
srcs: [
- "mock/mock_hcic_*.cc",
+ "mock/mock_hcic_*.cc",
],
}
filegroup {
name: "TestMockMainShimEntry",
srcs: [
- "mock/mock_main_shim_entry.cc",
+ "mock/mock_main_shim_entry.cc",
],
}
filegroup {
name: "TestMockMainShimLeScanning",
srcs: [
- "mock/mock_main_shim_le_scanning_manager.cc",
- "mock/mock_main_shim.cc",
+ "mock/mock_main_shim_le_scanning_manager.cc",
+ "mock/mock_main_shim.cc",
],
}
filegroup {
name: "TestMockMainShimFlags",
srcs: [
- "mock/mock_main_shim.cc",
+ "mock/mock_main_shim.cc",
],
}
filegroup {
- name: "TestMockBtif",
- srcs: [
- ":TestCommonJniThread",
- ":TestCommonCoreInterface",
- ":TestMockBluetoothInterface",
- "mock/mock_btif*.cc",
- ],
+ name: "TestMockBtif",
+ srcs: [
+ ":TestCommonJniThread",
+ ":TestCommonCoreInterface",
+ ":TestMockBluetoothInterface",
+ "mock/mock_btif*.cc",
+ ],
}
filegroup {
- name: "TestMockStackSdp",
- srcs: [
- "mock/mock_stack_sdp*.cc",
- ],
+ name: "TestMockStackSdp",
+ srcs: [
+ "mock/mock_stack_sdp*.cc",
+ ],
}
filegroup {
- name: "TestMockStackBtm",
- srcs: [
- "mock/mock_stack_btm*.cc",
- ],
+ name: "TestMockStackBtm",
+ srcs: [
+ "mock/mock_stack_btm*.cc",
+ ],
}
filegroup {
- name: "TestStubLegacyTrace",
- srcs: [
- "stub/legacy_trace.cc",
- ],
+ name: "TestStubLegacyTrace",
+ srcs: [
+ "stub/legacy_trace.cc",
+ ],
}
filegroup {
- name: "TestStubOsi",
- srcs: [
- "stub/osi.cc",
- ],
+ name: "TestStubOsi",
+ srcs: [
+ "stub/osi.cc",
+ ],
}
filegroup {
- name: "TestMockOsi",
+ name: "TestMockOsi",
srcs: [
- "mock/mock_osi_*.cc",
+ "mock/mock_osi_*.cc",
],
}
filegroup {
- name: "TestMockStackAcl",
- srcs: [
- "mock/mock_stack_acl*.cc",
- ],
+ name: "TestMockStackAcl",
+ srcs: [
+ "mock/mock_stack_acl*.cc",
+ ],
}
filegroup {
- name: "TestMockStackSmp",
- srcs: [
- "mock/mock_stack_smp*.cc",
- ],
+ name: "TestMockStackSmp",
+ srcs: [
+ "mock/mock_stack_smp*.cc",
+ ],
}
filegroup {
- name: "TestMockStackMetrics",
- srcs: [
- "mock/mock_stack_metrics*.cc",
- ],
+ name: "TestMockStackMetrics",
+ srcs: [
+ "mock/mock_stack_metrics*.cc",
+ ],
}
filegroup {
- name: "TestMockStackGap",
- srcs: [
- "mock/mock_stack_gap*.cc",
- ],
+ name: "TestMockStackGap",
+ srcs: [
+ "mock/mock_stack_gap*.cc",
+ ],
}
filegroup {
- name: "TestMockStackEatt",
- srcs: [
- "mock/mock_stack_eatt*.cc",
- ],
+ name: "TestMockStackEatt",
+ srcs: [
+ "mock/mock_stack_eatt*.cc",
+ ],
}
filegroup {
- name: "TestMockStackGatt",
- srcs: [
- "mock/mock_stack_gatt*.cc",
- ],
+ name: "TestMockStackGatt",
+ srcs: [
+ "mock/mock_stack_gatt*.cc",
+ ],
}
filegroup {
- name: "TestMockStackBtu",
- srcs: [
- "mock/mock_stack_btu*.cc",
- ],
+ name: "TestMockStackBtu",
+ srcs: [
+ "mock/mock_stack_btu*.cc",
+ ],
}
filegroup {
- name: "TestMockMainBte",
- srcs: [
- "mock/mock_main_bte*.cc",
- ],
+ name: "TestMockMainBte",
+ srcs: [
+ "mock/mock_main_bte*.cc",
+ ],
}
filegroup {
- name: "TestMockStackCryptotoolbox",
- srcs: [
- "mock/mock_stack_crypto_toolbox*.cc",
- ],
+ name: "TestMockStackCryptotoolbox",
+ srcs: [
+ "mock/mock_stack_crypto_toolbox*.cc",
+ ],
}
filegroup {
- name: "TestMockBtu",
- srcs: [
- "mock/mock_btu_*cc",
- ],
+ name: "TestMockBtu",
+ srcs: [
+ "mock/mock_btu_*cc",
+ ],
}
filegroup {
- name: "TestMockUtils",
- srcs: [
- "mock/mock_utils_*cc",
- ],
+ name: "TestMockUtils",
+ srcs: [
+ "mock/mock_utils_*cc",
+ ],
}
filegroup {
- name: "TestCommonMockFunctions",
- srcs: [
- "common/mock_functions.cc",
- ],
+ name: "TestCommonMockFunctions",
+ srcs: [
+ "common/mock_functions.cc",
+ ],
}
filegroup {
- name: "TestCommonJniThread",
- srcs: [
- "common/jni_thread.cc",
- ],
+ name: "TestCommonJniThread",
+ srcs: [
+ "common/jni_thread.cc",
+ ],
}
filegroup {
- name: "TestCommonMainHandler",
- srcs: [
- "common/main_handler.cc",
- ],
+ name: "TestCommonMainHandler",
+ srcs: [
+ "common/main_handler.cc",
+ ],
}
filegroup {
- name: "TestCommonInitFlags",
- srcs: [
- "common/init_flags.cc",
- ],
+ name: "TestCommonInitFlags",
+ srcs: [
+ "common/init_flags.cc",
+ ],
}
filegroup {
- name: "TestCommonStackConfig",
- srcs: [
- "common/stack_config.cc",
- ],
+ name: "TestCommonStackConfig",
+ srcs: [
+ "common/stack_config.cc",
+ ],
}
filegroup {
- name: "TestCommonCoreInterface",
- srcs: [
- "common/core_interface.cc",
- ],
+ name: "TestCommonCoreInterface",
+ srcs: [
+ "common/core_interface.cc",
+ ],
}
filegroup {
- name: "TestCommonLogMsg",
- srcs: [
- "common/log_msg.cc",
- ],
+ name: "TestCommonLogMsg",
+ srcs: [
+ "common/log_msg.cc",
+ ],
}
filegroup {
- name: "TestMockBluetoothInterface",
- srcs: [
- "mock/mock_bluetooth_interface.cc",
- ],
+ name: "TestMockBluetoothInterface",
+ srcs: [
+ "mock/mock_bluetooth_interface.cc",
+ ],
}
filegroup {
- name: "TestMockStackHcic",
- srcs: [
- "mock/mock_stack_hcic*.cc",
- ],
+ name: "TestMockStackHcic",
+ srcs: [
+ "mock/mock_stack_hcic*.cc",
+ ],
}
filegroup {
- name: "TestMockLegacyHciInterface",
- srcs: [
- "mock/mock_legacy_hci_iterface.cc"
- ],
+ name: "TestMockLegacyHciInterface",
+ srcs: [
+ "mock/mock_legacy_hci_iterface.cc",
+ ],
}
filegroup {
- name: "TestMockSrvcDis",
- srcs: [
- "mock/mock_stack_srvc_dis.cc"
- ],
+ name: "TestMockSrvcDis",
+ srcs: [
+ "mock/mock_stack_srvc_dis.cc",
+ ],
}
cc_defaults {
@@ -508,7 +508,7 @@ cc_defaults {
target: {
android: {
test_config_template: ":BluetoothTestConfigTemplate",
- test_suites: ["mts-bluetooth",],
+ test_suites: ["mts-bluetooth"],
},
},
compile_multilib: "both",
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index eaf046c85c2..40cc65f287e 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -8,36 +8,36 @@ package {
}
sh_binary {
- name: "headless_build_timestamp",
- host_supported: true,
- src: "tools/build_timestamp.sh",
+ name: "headless_build_timestamp",
+ host_supported: true,
+ src: "tools/build_timestamp.sh",
}
genrule {
- name : "HeadlessBuildTimestamp",
- tools: [
- "headless_build_timestamp",
- ],
- cmd: "$(location headless_build_timestamp) > $(out)",
- out: [
- "build_timestamp.h"
- ],
+ name: "HeadlessBuildTimestamp",
+ tools: [
+ "headless_build_timestamp",
+ ],
+ cmd: "$(location headless_build_timestamp) > $(out)",
+ out: [
+ "build_timestamp.h",
+ ],
}
filegroup {
name: "TestHeadlessModules",
srcs: [
- "connect/connect.cc",
- "discovery/discovery.cc",
- "dumpsys/dumpsys.cc",
- "nop/nop.cc",
- "pairing/pairing.cc",
- "read/name.cc",
- "read/read.cc",
- "scan/scan.cc",
- "sdp/sdp.cc",
- "sdp/sdp_db.cc",
- ],
+ "connect/connect.cc",
+ "discovery/discovery.cc",
+ "dumpsys/dumpsys.cc",
+ "nop/nop.cc",
+ "pairing/pairing.cc",
+ "read/name.cc",
+ "read/read.cc",
+ "scan/scan.cc",
+ "sdp/sdp.cc",
+ "sdp/sdp_db.cc",
+ ],
}
cc_binary {
@@ -125,17 +125,17 @@ cc_binary {
"libbase",
"libbinder_ndk",
"libcrypto",
- "libcutils", // property_get_bool
+ "libcutils", // property_get_bool
"libfmq",
"libhidlbase",
"libjsoncpp",
- "liblog", // __android_log_print
+ "liblog", // __android_log_print
"libprocessgroup",
"libtinyxml2",
"libutils",
],
ldflags: ["-rdynamic"],
sanitize: {
- cfi: false,
+ cfi: false,
},
}
diff --git a/system/test/rootcanal/Android.bp b/system/test/rootcanal/Android.bp
index 54eb54e5145..daa03b23013 100644
--- a/system/test/rootcanal/Android.bp
+++ b/system/test/rootcanal/Android.bp
@@ -25,8 +25,8 @@ package {
cc_binary {
name: "android.hardware.bluetooth@1.1-service.sim",
defaults: [
- "gd_defaults",
- "libchrome_support_defaults"
+ "gd_defaults",
+ "libchrome_support_defaults",
],
proprietary: true,
relative_install_path: "hw",
@@ -35,7 +35,7 @@ cc_binary {
"service.cc",
],
visibility: [
- "//platform_testing/libraries/sts-common-util/host-side/rootcanal"
+ "//platform_testing/libraries/sts-common-util/host-side/rootcanal",
],
header_libs: ["libbluetooth_headers"],
shared_libs: [
@@ -77,8 +77,8 @@ cc_binary {
cc_library_shared {
name: "android.hardware.bluetooth@1.1-impl-sim",
defaults: [
- "gd_defaults",
- "libchrome_support_defaults"
+ "gd_defaults",
+ "libchrome_support_defaults",
],
proprietary: true,
relative_install_path: "hw",
@@ -86,7 +86,7 @@ cc_library_shared {
"bluetooth_hci.cc",
],
visibility: [
- "//platform_testing/libraries/sts-common-util/host-side/rootcanal"
+ "//platform_testing/libraries/sts-common-util/host-side/rootcanal",
],
header_libs: ["libbluetooth_headers"],
shared_libs: [
@@ -107,7 +107,7 @@ cc_library_shared {
"libbt_init_flags_bridge_header",
],
whole_static_libs: [
- "libbt-rootcanal"
+ "libbt-rootcanal",
],
static_libs: [
"android.hardware.bluetooth-async",
diff --git a/system/types/Android.bp b/system/types/Android.bp
index 9d499820916..0923fe1e93e 100644
--- a/system/types/Android.bp
+++ b/system/types/Android.bp
@@ -10,7 +10,7 @@ package {
cc_library_headers {
name: "libbluetooth-types-header",
- visibility:["//visibility:public"],
+ visibility: ["//visibility:public"],
export_include_dirs: ["./"],
vendor_available: true,
host_supported: true,
@@ -20,7 +20,7 @@ cc_library_headers {
"//apex_available:platform",
"com.android.media",
"com.android.media.swcodec",
- "com.android.btservices"
+ "com.android.btservices",
],
// As part of updatable mainline modules(media, swcodec), it should support at least 29(Q)
min_sdk_version: "29",
@@ -39,7 +39,7 @@ cc_library_static {
/* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
"-fvisibility=default",
],
- visibility:["//visibility:public"],
+ visibility: ["//visibility:public"],
host_supported: true,
srcs: [
"class_of_device.cc",
@@ -63,7 +63,7 @@ cc_test {
"mts_defaults",
],
include_dirs: [
- "packages/modules/Bluetooth/system",
+ "packages/modules/Bluetooth/system",
],
host_supported: true,
srcs: [
diff --git a/system/udrv/Android.bp b/system/udrv/Android.bp
index 8ce6d718409..df528de44af 100644
--- a/system/udrv/Android.bp
+++ b/system/udrv/Android.bp
@@ -28,5 +28,5 @@ cc_library_static {
"//apex_available:platform",
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
diff --git a/system/utils/Android.bp b/system/utils/Android.bp
index feb94d32d9d..f5392552bb0 100644
--- a/system/utils/Android.bp
+++ b/system/utils/Android.bp
@@ -31,5 +31,5 @@ cc_library_static {
apex_available: [
"com.android.btservices",
],
- min_sdk_version: "Tiramisu"
+ min_sdk_version: "Tiramisu",
}
diff --git a/tools/rootcanal/Android.bp b/tools/rootcanal/Android.bp
index 48a9bcf51bc..97eb5a3aabf 100644
--- a/tools/rootcanal/Android.bp
+++ b/tools/rootcanal/Android.bp
@@ -9,7 +9,7 @@ package {
default_visibility: [
"//device:__subpackages__",
"//packages/modules/Bluetooth:__subpackages__",
- "//tools/netsim:__subpackages__"
+ "//tools/netsim:__subpackages__",
],
}
@@ -19,7 +19,7 @@ cc_defaults {
tidy_checks: [
"-*",
"readability-*",
- "-readability-function-size",
+ "-readability-function-size",
"-readability-identifier-length",
"-readability-implicit-bool-conversion",
"-readability-magic-numbers",
@@ -112,7 +112,7 @@ cc_library_static {
".",
],
export_generated_headers: [
- "BluetoothGeneratedPackets_h"
+ "BluetoothGeneratedPackets_h",
],
whole_static_libs: [
"liblmp",
@@ -173,7 +173,7 @@ cc_library_host_shared {
// packets/link_layer_packets.pdl.
genrule {
name: "link_layer_packets_python3_gen",
- defaults: [ "pdl_python_generator_defaults" ],
+ defaults: ["pdl_python_generator_defaults"],
cmd: "$(location :pdl) $(in) |" +
" $(location :pdl_python_generator)" +
" --output $(out) --custom-type-location py.bluetooth",
@@ -189,7 +189,7 @@ genrule {
// hci_packets.pdl.
genrule {
name: "hci_packets_python3_gen",
- defaults: [ "pdl_python_generator_defaults" ],
+ defaults: ["pdl_python_generator_defaults"],
cmd: "$(location :pdl) $(in) |" +
" $(location :pdl_python_generator)" +
" --output $(out) --custom-type-location py.bluetooth",
diff --git a/tools/rootcanal/lmp/Android.bp b/tools/rootcanal/lmp/Android.bp
index e438e6a54cb..791741390fd 100644
--- a/tools/rootcanal/lmp/Android.bp
+++ b/tools/rootcanal/lmp/Android.bp
@@ -10,7 +10,7 @@ package {
rust_ffi {
name: "liblmp",
host_supported: true,
- vendor_available : true,
+ vendor_available: true,
crate_name: "lmp",
srcs: [
"src/lib.rs",
@@ -54,7 +54,10 @@ rust_test_host {
],
auto_gen_config: true,
edition: "2018",
- proc_macros: ["libnum_derive", "libpaste"],
+ proc_macros: [
+ "libnum_derive",
+ "libpaste",
+ ],
rustlibs: [
"libbt_packets",
"libbytes",
--
GitLab