diff --git a/android/pandora/server/Android.bp b/android/pandora/server/Android.bp
index 39125ab625a08569b4a56669b47bea50b6993e6b..9ba878189cb7721ac602a0a5f578293902db60ea 100644
--- a/android/pandora/server/Android.bp
+++ b/android/pandora/server/Android.bp
@@ -10,8 +10,11 @@ java_library_static {
sdk_version: "core_platform",
libs: [
+ // order matters: classes in framework-bluetooth are resolved before framework, meaning
+ // @hide APIs in framework-bluetooth are resolved before @SystemApi stubs in framework
// Access to hidden apis in Bluetooth:
"framework-bluetooth.impl",
+
"framework",
],
diff --git a/apex/Android.bp b/apex/Android.bp
index 7451a8c455f96b9aee0672335c5f4e8515c20adc..b17c8a692ffaf248ea943872b6776151b285bd72 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -22,8 +22,8 @@ apex {
systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"],
compat_configs: [
"bluetooth-compat-config",
- "framework-bluetooth-compat-config",
"bluetoothapk-platform-compat-config",
+ "framework-bluetooth-compat-config",
],
apps: ["Bluetooth"],
@@ -41,9 +41,9 @@ apex {
"audio_set_configurations_json",
"audio_set_scenarios_bfbs",
"audio_set_scenarios_json",
- "btservices-linker-config",
"bt_did.conf",
"bt_stack.conf",
+ "btservices-linker-config",
"interop_database.conf",
"privapp_allowlist_com.android.bluetooth.xml",
],
diff --git a/framework/Android.bp b/framework/Android.bp
index 6381836fd767251e3801ab6ed8b93b680490e64a..0cd3c0052e02622cc6e85cfbbd270a115330e692 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -11,8 +11,8 @@ filegroup {
name: "framework-bluetooth-sources",
defaults: ["framework-sources-module-defaults"],
srcs: [
- "java/**/*.java",
"java/**/*.aidl",
+ "java/**/*.java",
],
path: "java",
}
@@ -24,13 +24,13 @@ java_defaults {
name: "framework-bluetooth-defaults",
defaults: ["bluetooth-module-sdk-version-defaults"],
static_libs: [
- "modules-utils-synchronous-result-receiver",
"PlatformProperties",
+ "modules-utils-synchronous-result-receiver",
],
libs: [
+ "app-compat-annotations",
"framework-tethering.stubs.module_lib",
"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
- "app-compat-annotations",
],
stub_only_libs: ["framework-tethering.stubs.module_lib"],
srcs: [
@@ -53,8 +53,8 @@ java_library {
java_sdk_library {
name: "framework-bluetooth",
defaults: [
- "framework-module-defaults",
"framework-bluetooth-defaults",
+ "framework-module-defaults",
],
jarjar_rules: ":bluetooth-jarjar-rules",
@@ -96,14 +96,14 @@ java_defaults {
name: "framework-bluetooth-tests-defaults",
sdk_version: "core_platform",
libs: [
+ "app-compat-annotations",
// order matters: classes in framework-bluetooth are resolved before framework, meaning
// @hide APIs in framework-bluetooth are resolved before @SystemApi stubs in framework
"framework-bluetooth.impl",
- "framework",
+ "framework",
// if sdk_version="" this gets automatically included, but here we need to add manually.
"framework-res",
- "app-compat-annotations",
],
defaults_visibility: ["//visibility:public"],
}
diff --git a/framework/tests/stress/Android.bp b/framework/tests/stress/Android.bp
index f176be001c55f5c93bf4e671740fffce93e501a8..7742c5795299b74312e213553a70677d383c304b 100644
--- a/framework/tests/stress/Android.bp
+++ b/framework/tests/stress/Android.bp
@@ -17,8 +17,8 @@ android_test {
exclude_filter: [],
},
libs: [
- "android.test.runner",
"android.test.base",
+ "android.test.runner",
],
static_libs: [
"androidx.test.rules",
diff --git a/framework/tests/unit/Android.bp b/framework/tests/unit/Android.bp
index 38e0574a671b2097b880fce81ac16bd86ef4ee24..3eeb86cadead796e98da254db4d87a4065a5023c 100644
--- a/framework/tests/unit/Android.bp
+++ b/framework/tests/unit/Android.bp
@@ -17,8 +17,8 @@ android_test {
exclude_filter: [],
},
libs: [
- "android.test.runner",
"android.test.base",
+ "android.test.runner",
],
static_libs: [
"androidx.test.ext.truth",
diff --git a/pandora/interfaces/Android.bp b/pandora/interfaces/Android.bp
index ea0c679db26abe39de38f92f121cf44f791cf153..df0efaa7b7703a9e4b51b3423702021754884fb5 100644
--- a/pandora/interfaces/Android.bp
+++ b/pandora/interfaces/Android.bp
@@ -19,8 +19,8 @@ java_library {
],
proto: {
include_dirs: [
- "external/protobuf/src",
"external/pandora/bt-test-interfaces",
+ "external/protobuf/src",
"packages/modules/Bluetooth/pandora/interfaces",
],
plugin: "grpc-java-plugin",
@@ -34,9 +34,9 @@ java_library {
name: "pandora_experimental-proto-java",
visibility: ["//packages/modules/Bluetooth/android/pandora/server"],
srcs: [
+ ":libprotobuf-internal-protos",
":pandora-protos",
"pandora_experimental/*.proto",
- ":libprotobuf-internal-protos",
],
static_libs: [
"libprotobuf-java-lite",
@@ -47,8 +47,8 @@ java_library {
canonical_path_from_root: false,
type: "lite",
include_dirs: [
- "external/protobuf/src",
"external/pandora/bt-test-interfaces",
+ "external/protobuf/src",
"packages/modules/Bluetooth/pandora/interfaces",
],
},
diff --git a/pandora/interfaces/python/Android.bp b/pandora/interfaces/python/Android.bp
index a44b40fbed2c486578c98896a4092526deed11ca..abf8ee674163d11857a544ad743d8ef1784a600a 100644
--- a/pandora/interfaces/python/Android.bp
+++ b/pandora/interfaces/python/Android.bp
@@ -23,13 +23,12 @@ genrule {
":pandora_experimental-protos",
],
out: [
- "pandora_experimental/py.typed",
"pandora_experimental/__init__.py",
- "pandora_experimental/_utils.py",
"pandora_experimental/_android_grpc.py",
"pandora_experimental/_android_grpc_aio.py",
"pandora_experimental/_android_pb2.py",
"pandora_experimental/_android_pb2.pyi",
+ "pandora_experimental/_utils.py",
"pandora_experimental/a2dp_grpc.py",
"pandora_experimental/a2dp_grpc_aio.py",
"pandora_experimental/a2dp_pb2.py",
@@ -70,6 +69,7 @@ genrule {
"pandora_experimental/pbap_grpc_aio.py",
"pandora_experimental/pbap_pb2.py",
"pandora_experimental/pbap_pb2.pyi",
+ "pandora_experimental/py.typed",
"pandora_experimental/rfcomm_grpc.py",
"pandora_experimental/rfcomm_grpc_aio.py",
"pandora_experimental/rfcomm_pb2.py",
@@ -90,7 +90,6 @@ filegroup {
filegroup {
name: "pandora_experimental-python-stubs",
srcs: [
- ":pandora_experimental-python-gen-src{pandora_experimental/py.typed}",
":pandora_experimental-python-gen-src{pandora_experimental/_android_pb2.pyi}",
":pandora_experimental-python-gen-src{pandora_experimental/a2dp_pb2.pyi}",
":pandora_experimental-python-gen-src{pandora_experimental/asha_pb2.pyi}",
@@ -102,6 +101,7 @@ filegroup {
":pandora_experimental-python-gen-src{pandora_experimental/mediaplayer_pb2.pyi}",
":pandora_experimental-python-gen-src{pandora_experimental/pan_pb2.pyi}",
":pandora_experimental-python-gen-src{pandora_experimental/pbap_pb2.pyi}",
+ ":pandora_experimental-python-gen-src{pandora_experimental/py.typed}",
":pandora_experimental-python-gen-src{pandora_experimental/rfcomm_pb2.pyi}",
],
}
diff --git a/pandora/server/Android.bp b/pandora/server/Android.bp
index e7db99511937de27ed4ec085e63b19e91ccd5d92..4c97919fdfc3465c165a9d8db18e710d2518514d 100644
--- a/pandora/server/Android.bp
+++ b/pandora/server/Android.bp
@@ -22,11 +22,11 @@ python_library_host {
"bumble_experimental/*.py",
],
libs: [
+ "bumble",
"libprotobuf-python",
"pandora_experimental-python",
- "bumble",
],
data: [
"bumble_experimental/py.typed",
- ]
+ ],
}
diff --git a/service/Android.bp b/service/Android.bp
index 8a9124f6497d1dcded899cf44a5e60259ff03609..ade5dd3cc3523155bf8d937e02aed1cdb516a704 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -19,8 +19,8 @@ package {
filegroup {
name: "services.bluetooth-sources",
srcs: [
- "java/**/*.java",
":statslog-bluetooth-java-gen",
+ "java/**/*.java",
],
visibility: [
"//frameworks/base/services",
@@ -56,20 +56,20 @@ java_library {
strict_updatability_linting: true,
},
libs: [
+ "app-compat-annotations",
"framework-annotations-lib",
"framework-bluetooth-pre-jarjar",
"framework-configinfrastructure",
- "app-compat-annotations",
"framework-statsd.stubs.module_lib",
],
static_libs: [
"androidx.annotation_annotation",
"androidx.appcompat_appcompat",
- "modules-utils-shell-command-handler",
"bluetooth-manager-service-proto-java-gen",
- "bluetooth-proto-enums-java-gen",
"bluetooth-nano-protos",
+ "bluetooth-proto-enums-java-gen",
+ "modules-utils-shell-command-handler",
],
apex_available: [
@@ -85,13 +85,13 @@ java_library {
defaults: ["service-bluetooth-common-defaults"],
installable: true,
static_libs: [
- "service-bluetooth-pre-jarjar",
"androidx.appcompat_appcompat",
+ "service-bluetooth-pre-jarjar",
],
libs: [
- "framework-bluetooth.impl",
"app-compat-annotations",
+ "framework-bluetooth.impl",
],
sdk_version: "system_server_current",
diff --git a/service/tests/Android.bp b/service/tests/Android.bp
index d0f8f4869225c698c367e62b4138874ec51f69eb..ad3cbf5323ac6a3e823062a1329bcf582088d27a 100644
--- a/service/tests/Android.bp
+++ b/service/tests/Android.bp
@@ -30,9 +30,9 @@ android_test {
static_libs: [
"androidx.test.rules",
+ "frameworks-base-testutils",
"mockito-target-extended-minus-junit4",
"platform-test-annotations",
- "frameworks-base-testutils",
"truth-prebuilt",
// Statically link service-bluetooth-pre-jarjar since we want to test the working copy of
@@ -46,17 +46,17 @@ android_test {
jarjar_rules: ":bluetooth-jarjar-rules",
libs: [
- "android.test.runner",
"android.test.base",
"android.test.mock",
+ "android.test.runner",
"framework-bluetooth-pre-jarjar",
],
jni_libs: [
// these are needed for Extended Mockito
+ "libbluetooth_jni",
"libdexmakerjvmtiagent",
"libstaticjvmtiagent",
- "libbluetooth_jni",
],
compile_multilib: "both",
certificate: ":com.android.bluetooth.certificate",
diff --git a/system/gd/Android.bp b/system/gd/Android.bp
index 83535db1374777793ea6e2d0a1e14afd34a72575..a3a3041cbe0696b1da641c55c7d2c919b60357f4 100644
--- a/system/gd/Android.bp
+++ b/system/gd/Android.bp
@@ -108,14 +108,19 @@ cc_defaults {
],
tidy_flags: [
"--header-filter=^.*packages/modules/Bluetooth/system/.*.h$",
+
"--extra-arg-before=-Xclang",
"--extra-arg-before=-analyzer-config",
+
"--extra-arg-before=-Xclang",
"--extra-arg-before=optin.cplusplus.UninitializedObject:Pedantic=true",
+
"--extra-arg-before=-Xclang",
"--extra-arg-before=-analyzer-config",
+
"--extra-arg-before=-Xclang",
"--extra-arg-before=optin.cplusplus.UninitializedObject:CheckPointeeInitialization=true",
+
],
}
@@ -427,7 +432,7 @@ cc_test {
"libbt_callbacks_cxx",
"libbt_shim_bridge",
"libbt_shim_ffi",
- "libbt-platform-protos-lite"
+ "libbt-platform-protos-lite",
],
shared_libs: [
"libcrypto",
@@ -642,6 +647,7 @@ rust_library {
crate_name: "bt_packets",
srcs: [
"rust/packets/lib.rs",
+
":BluetoothGeneratedPackets_rust",
],
edition: "2018",
@@ -666,6 +672,7 @@ rust_library {
crate_name: "bt_packets",
srcs: [
"rust/packets/lib.rs",
+
":BluetoothGeneratedPackets_rust",
],
edition: "2018",
@@ -689,6 +696,7 @@ rust_test_host {
],
srcs: [
"rust/packets/lib.rs",
+
":BluetoothGeneratedPackets_rust",
],
test_suites: ["general-tests"],
@@ -725,6 +733,7 @@ rust_test_host {
],
srcs: [
"rust/packets/test_lib.rs",
+
":TestGeneratedPackets_rust",
],
test_suites: ["general-tests"],
diff --git a/system/gd/common/Android.bp b/system/gd/common/Android.bp
index 147025e30b68d61769882aaaf79cd024d03dc7ea..ad6d0365b5f985e757938f7b5c9aaf9689f442a4 100644
--- a/system/gd/common/Android.bp
+++ b/system/gd/common/Android.bp
@@ -12,8 +12,8 @@ filegroup {
srcs: [
"audit_log.cc",
"metric_id_manager.cc",
- "strings.cc",
"stop_watch.cc",
+ "strings.cc",
],
}
diff --git a/system/gd/dumpsys/Android.bp b/system/gd/dumpsys/Android.bp
index 4531601bd8e9fa57280a4ca24ac3ebbd05566d33..0f579426a42840b4d5852ff415797034351caa9e 100644
--- a/system/gd/dumpsys/Android.bp
+++ b/system/gd/dumpsys/Android.bp
@@ -34,18 +34,18 @@ genrule {
],
cmd: "$(location flatc) -I packages/modules/Bluetooth/system/gd -b --schema -o $(genDir) --cpp $(in) ",
srcs: [
- "test_data/root.fbs",
"test_data/bar.fbs",
"test_data/baz.fbs",
"test_data/foo.fbs",
"test_data/qux.fbs",
+ "test_data/root.fbs",
],
out: [
- "root_generated.h",
"bar_generated.h",
"baz_generated.h",
"foo_generated.h",
"qux_generated.h",
+ "root_generated.h",
],
}
@@ -57,18 +57,18 @@ genrule {
],
cmd: "$(location flatc) -I packages/modules/Bluetooth/system/gd -b --schema -o $(genDir) --cpp $(in) ",
srcs: [
- "test_data/root.fbs",
"test_data/bar.fbs",
"test_data/baz.fbs",
"test_data/foo.fbs",
"test_data/qux.fbs",
+ "test_data/root.fbs",
],
out: [
- "root.bfbs",
"bar.bfbs",
"baz.bfbs",
"foo.bfbs",
"qux.bfbs",
+ "root.bfbs",
],
}
@@ -127,8 +127,8 @@ genrule {
"bluetooth_flatbuffer_test.fbs",
],
out: [
- "bluetooth_flatbuffer_test_generated.h",
"bluetooth_flatbuffer_test.bfbs",
+ "bluetooth_flatbuffer_test_generated.h",
],
}
@@ -136,9 +136,9 @@ cc_library {
name: "libbluetooth-dumpsys",
host_supported: true,
defaults: [
- "gd_defaults",
"gd_clang_file_coverage",
"gd_clang_tidy",
+ "gd_defaults",
],
generated_sources: [
"BluetoothGeneratedDumpsysBundledSchema_cc",
@@ -153,9 +153,9 @@ cc_library {
name: "libbluetooth-dumpsys-test",
host_supported: true,
defaults: [
- "gd_defaults",
"gd_clang_file_coverage",
"gd_clang_tidy",
+ "gd_defaults",
],
generated_sources: [
"BluetoothGeneratedDumpsysBundledTestSchema_cc",
@@ -166,9 +166,9 @@ cc_library {
name: "libbluetooth-dumpsys-unittest",
host_supported: true,
defaults: [
- "gd_defaults",
"gd_clang_file_coverage",
"gd_clang_tidy",
+ "gd_defaults",
],
generated_headers: [
"BluetoothGeneratedDumpsysTestSchema_cc",
@@ -179,17 +179,17 @@ cc_test {
name: "bluetooth_flatbuffer_tests",
test_suites: ["device-tests"],
defaults: [
+ "bluetooth_gtest_x86_asan_workaround",
"fluoride_common_options",
"mts_defaults",
- "bluetooth_gtest_x86_asan_workaround",
],
host_supported: true,
test_options: {
unit_test: true,
},
static_libs: [
- "libgmock",
"libflatbuffers-cpp",
+ "libgmock",
],
srcs: [
"bluetooth_flatbuffer_test.cc",
diff --git a/system/gd/dumpsys/bundler/Android.bp b/system/gd/dumpsys/bundler/Android.bp
index 331f9256dc94e77178f0cba7c782c689723149b7..0dcaa0037fa52683e5c062296c1b4997aa017e51 100644
--- a/system/gd/dumpsys/bundler/Android.bp
+++ b/system/gd/dumpsys/bundler/Android.bp
@@ -41,8 +41,8 @@ genrule {
"bundler_schema.fbs",
],
out: [
- "bundler_schema_generated.h",
"bundler_schema.bfbs",
+ "bundler_schema_generated.h",
],
}
diff --git a/system/gd/hal/Android.bp b/system/gd/hal/Android.bp
index e8059a9b3a39682fb1c741ef660d82a1d7a05283..077152423d85a7cdce363d8a20f8c1997fead4c2 100644
--- a/system/gd/hal/Android.bp
+++ b/system/gd/hal/Android.bp
@@ -20,9 +20,9 @@ filegroup {
filegroup {
name: "BluetoothHalTestSources",
srcs: [
- "snoop_logger_test.cc",
"snoop_logger_socket_test.cc",
"snoop_logger_socket_thread_test.cc",
+ "snoop_logger_test.cc",
],
}
diff --git a/system/gd/hci/Android.bp b/system/gd/hci/Android.bp
index 88c0dd233ebff0c78b1ecac5280e4b922edb666b..ce384a2bf41b76ad1fb7e6e32f4111c31155afcc 100644
--- a/system/gd/hci/Android.bp
+++ b/system/gd/hci/Android.bp
@@ -20,13 +20,13 @@ filegroup {
name: "BluetoothHciSources",
srcs: [
":BluetoothHciPacketSources",
+ "acl_manager.cc",
"acl_manager/acl_connection.cc",
+ "acl_manager/acl_fragmenter.cc",
"acl_manager/acl_scheduler.cc",
"acl_manager/classic_acl_connection.cc",
"acl_manager/le_acl_connection.cc",
"acl_manager/round_robin_scheduler.cc",
- "acl_manager/acl_fragmenter.cc",
- "acl_manager.cc",
"controller.cc",
"distance_measurement_manager.cc",
"hci_layer.cc",
@@ -48,13 +48,13 @@ filegroup {
srcs: [
":BluetoothHalFake",
"acl_builder_test.cc",
- "acl_manager_test.cc",
- "acl_manager_unittest.cc",
"acl_manager/acl_scheduler_test.cc",
"acl_manager/classic_acl_connection_test.cc",
"acl_manager/le_acl_connection_test.cc",
"acl_manager/le_impl_test.cc",
"acl_manager/round_robin_scheduler_test.cc",
+ "acl_manager_test.cc",
+ "acl_manager_unittest.cc",
"address_unittest.cc",
"address_with_type_test.cc",
"class_of_device_unittest.cc",
@@ -64,22 +64,22 @@ filegroup {
"hci_layer_test.cc",
"hci_layer_unittest.cc",
"hci_packets_test.cc",
- "remote_name_request_test.cc",
- "uuid_unittest.cc",
+ "le_address_manager_test.cc",
+ "le_advertising_manager_test.cc",
"le_periodic_sync_manager_test.cc",
"le_scanning_manager_test.cc",
"le_scanning_reassembler_test.cc",
- "le_advertising_manager_test.cc",
- "le_address_manager_test.cc",
+ "remote_name_request_test.cc",
+ "uuid_unittest.cc",
],
}
filegroup {
name: "BluetoothFacade_hci_layer",
srcs: [
- "facade/facade.cc",
"facade/acl_manager_facade.cc",
"facade/controller_facade.cc",
+ "facade/facade.cc",
"facade/le_acl_manager_facade.cc",
"facade/le_advertising_manager_facade.cc",
"facade/le_initiator_address_facade.cc",
@@ -97,9 +97,9 @@ filegroup {
filegroup {
name: "BluetoothHciFuzzHelperSources",
srcs: [
- "fuzz/status_vs_complete_commands.cc",
- "fuzz/hci_layer_fuzz_client.cc",
"fuzz/fuzz_hci_layer.cc",
+ "fuzz/hci_layer_fuzz_client.cc",
+ "fuzz/status_vs_complete_commands.cc",
],
}
diff --git a/system/gd/iso/Android.bp b/system/gd/iso/Android.bp
index fabab23b285536c47423256e8247af93cb2c4bd2..b4c2dee7c650d0c33700c7594b50a286561e1ff6 100644
--- a/system/gd/iso/Android.bp
+++ b/system/gd/iso/Android.bp
@@ -10,9 +10,9 @@ package {
filegroup {
name: "BluetoothIsoSources",
srcs: [
+ "internal/iso_manager_impl.cc",
"iso_manager.cc",
"iso_module.cc",
- "internal/iso_manager_impl.cc",
],
}
diff --git a/system/gd/l2cap/Android.bp b/system/gd/l2cap/Android.bp
index bdec3a65361b3ad7cec5446b316ba596241453da..13820b571cb916f5df2ae454db511d0b21449d7a 100644
--- a/system/gd/l2cap/Android.bp
+++ b/system/gd/l2cap/Android.bp
@@ -10,21 +10,21 @@ package {
filegroup {
name: "BluetoothL2capSources",
srcs: [
- "fcs.cc",
"classic/dynamic_channel_manager.cc",
"classic/dynamic_channel_service.cc",
"classic/fixed_channel.cc",
"classic/fixed_channel_manager.cc",
"classic/fixed_channel_service.cc",
+ "classic/internal/dumpsys_helper.cc",
"classic/internal/dynamic_channel_service_manager_impl.cc",
"classic/internal/fixed_channel_impl.cc",
"classic/internal/fixed_channel_service_manager_impl.cc",
"classic/internal/link.cc",
"classic/internal/link_manager.cc",
"classic/internal/signalling_manager.cc",
- "classic/internal/dumpsys_helper.cc",
"classic/l2cap_classic_module.cc",
"dynamic_channel.cc",
+ "fcs.cc",
"internal/basic_mode_channel_data_controller.cc",
"internal/data_pipeline_manager.cc",
"internal/dynamic_channel_allocator.cc",
@@ -40,7 +40,6 @@ filegroup {
"le/fixed_channel.cc",
"le/fixed_channel_manager.cc",
"le/fixed_channel_service.cc",
- "le/link_options.cc",
"le/internal/dynamic_channel_service_manager_impl.cc",
"le/internal/fixed_channel_impl.cc",
"le/internal/fixed_channel_service_manager_impl.cc",
@@ -48,6 +47,7 @@ filegroup {
"le/internal/link_manager.cc",
"le/internal/signalling_manager.cc",
"le/l2cap_le_module.cc",
+ "le/link_options.cc",
],
}
@@ -57,8 +57,8 @@ filegroup {
"classic/internal/dynamic_channel_service_manager_test.cc",
"classic/internal/fixed_channel_impl_test.cc",
"classic/internal/fixed_channel_service_manager_test.cc",
- "classic/internal/link_test.cc",
"classic/internal/link_manager_test.cc",
+ "classic/internal/link_test.cc",
"classic/internal/signalling_manager_test.cc",
"internal/basic_mode_channel_data_controller_test.cc",
"internal/dynamic_channel_allocator_test.cc",
diff --git a/system/gd/l2cap/fuzz/Android.bp b/system/gd/l2cap/fuzz/Android.bp
index c8487488a2af3be247c9c025501760051273b954..6127a9867901b8707876084ef50c077916eae536 100644
--- a/system/gd/l2cap/fuzz/Android.bp
+++ b/system/gd/l2cap/fuzz/Android.bp
@@ -11,25 +11,25 @@ cc_fuzz {
name: "bluetooth_gd_l2cap_fuzzer",
defaults: ["gd_fuzz_defaults"],
include_dirs: [
+ "hardware/interfaces/keymaster/4.0/support/include",
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/gd",
+ "packages/modules/Bluetooth/system/bta/dm",
"packages/modules/Bluetooth/system/bta/include",
"packages/modules/Bluetooth/system/bta/sys",
- "packages/modules/Bluetooth/system/bta/dm",
+ "packages/modules/Bluetooth/system/btif/co",
+ "packages/modules/Bluetooth/system/btif/include",
+ "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
+ "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
+ "packages/modules/Bluetooth/system/gd",
"packages/modules/Bluetooth/system/internal_include",
- "packages/modules/Bluetooth/system/stack/include",
- "packages/modules/Bluetooth/system/stack/l2cap",
"packages/modules/Bluetooth/system/stack/a2dp",
- "packages/modules/Bluetooth/system/stack/btm",
"packages/modules/Bluetooth/system/stack/avdt",
+ "packages/modules/Bluetooth/system/stack/btm",
+ "packages/modules/Bluetooth/system/stack/include",
+ "packages/modules/Bluetooth/system/stack/l2cap",
"packages/modules/Bluetooth/system/udrv/include",
- "packages/modules/Bluetooth/system/btif/include",
- "packages/modules/Bluetooth/system/btif/co",
"packages/modules/Bluetooth/system/vnd/include",
- "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
- "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
"system/security/keystore/include",
- "hardware/interfaces/keymaster/4.0/support/include",
],
srcs: [
"channel_fuzz_controller.cc",
diff --git a/system/gd/metrics/Android.bp b/system/gd/metrics/Android.bp
index 5ae11f16e176a3cd66c8a36dc52c4602bdad2fc4..15c4750d6a4e9d42b825b2e9c3a2f01b0fa1a197 100644
--- a/system/gd/metrics/Android.bp
+++ b/system/gd/metrics/Android.bp
@@ -12,7 +12,7 @@ filegroup {
srcs: [
"counter_metrics.cc",
"metrics_state.cc",
- "utils.cc"
+ "utils.cc",
],
}
@@ -20,6 +20,6 @@ filegroup {
name: "BluetoothMetricsTestSources",
srcs: [
"counter_metrics_unittest.cc",
- "metrics_state_unittest.cc"
+ "metrics_state_unittest.cc",
],
}
diff --git a/system/gd/os/Android.bp b/system/gd/os/Android.bp
index 25f34ecfb311a84895da6f8fc60fddde784802f2..3ac15e49abcdcedb2ec5d301eaca4bb464920477 100644
--- a/system/gd/os/Android.bp
+++ b/system/gd/os/Android.bp
@@ -61,9 +61,9 @@ filegroup {
srcs: [
"linux_generic/alarm.cc",
"linux_generic/files.cc",
+ "linux_generic/reactive_semaphore.cc",
"linux_generic/reactor.cc",
"linux_generic/repeating_alarm.cc",
- "linux_generic/reactive_semaphore.cc",
"linux_generic/thread.cc",
"linux_generic/wakelock_manager.cc",
],
@@ -86,8 +86,8 @@ filegroup {
name: "BluetoothOsBenchmarkSources",
srcs: [
"alarm_benchmark.cc",
- "thread_benchmark.cc",
"queue_benchmark.cc",
+ "thread_benchmark.cc",
],
}
diff --git a/system/gd/packet/Android.bp b/system/gd/packet/Android.bp
index 717bd534fc7c55a400fcac85e0db071f7a7f9fda..851afb6ccfb4609267217a84b83c437fe7ad5451 100644
--- a/system/gd/packet/Android.bp
+++ b/system/gd/packet/Android.bp
@@ -13,8 +13,8 @@ filegroup {
"bit_inserter.cc",
"byte_inserter.cc",
"byte_observer.cc",
- "iterator.cc",
"fragmenting_inserter.cc",
+ "iterator.cc",
"packet_view.cc",
"raw_builder.cc",
"view.cc",
diff --git a/system/gd/packet/parser/Android.bp b/system/gd/packet/parser/Android.bp
index aaa08050a89a21b691241d5bd26e38a520ef8a30..b506351621662483cd3ecd9f693a3b0e7ab1b6cb 100644
--- a/system/gd/packet/parser/Android.bp
+++ b/system/gd/packet/parser/Android.bp
@@ -10,8 +10,11 @@ package {
cc_binary_host {
name: "bluetooth_packetgen",
srcs: [
+ "checksum_def.cc",
+ "custom_field_def.cc",
+ "enum_def.cc",
+ "enum_gen.cc",
"fields/array_field.cc",
- "fields/vector_field.cc",
"fields/body_field.cc",
"fields/checksum_field.cc",
"fields/checksum_start_field.cc",
@@ -31,20 +34,17 @@ cc_binary_host {
"fields/size_field.cc",
"fields/struct_field.cc",
"fields/variable_length_struct_field.cc",
- "checksum_def.cc",
- "custom_field_def.cc",
- "enum_def.cc",
- "enum_gen.cc",
+ "fields/vector_field.cc",
+ "gen_cpp.cc",
+ "gen_rust.cc",
+ "language_l.ll",
+ "language_y.yy",
+ "main.cc",
"packet_def.cc",
"packet_dependency.cc",
"parent_def.cc",
"struct_def.cc",
"struct_parser_generator.cc",
- "main.cc",
- "language_y.yy",
- "language_l.ll",
- "gen_cpp.cc",
- "gen_rust.cc",
],
static_libs: [
"libc++fs",
diff --git a/system/gd/packet/parser/test/Android.bp b/system/gd/packet/parser/test/Android.bp
index 28b121b00ec47808541ca484bd981e92d7b6b71b..ef23a607b16b60fecf885fcf9b3402afbcb1233f 100644
--- a/system/gd/packet/parser/test/Android.bp
+++ b/system/gd/packet/parser/test/Android.bp
@@ -14,12 +14,12 @@ genrule {
],
cmd: "$(location bluetooth_packetgen) --testing --include=packages/modules/Bluetooth/system/gd --out=$(genDir) $(in)",
srcs: [
- "test_packets.pdl",
"big_endian_test_packets.pdl",
+ "test_packets.pdl",
],
out: [
- "packet/parser/test/test_packets.h",
"packet/parser/test/big_endian_test_packets.h",
+ "packet/parser/test/test_packets.h",
],
}
diff --git a/system/gd/proto/Android.bp b/system/gd/proto/Android.bp
index 19e95daa63db69c7bc073ec6f5c8739e2e3e25fa..538d8df347fc94a6d9f0e9a34302792e40887e00 100644
--- a/system/gd/proto/Android.bp
+++ b/system/gd/proto/Android.bp
@@ -14,8 +14,8 @@ java_library_static {
type: "lite",
},
srcs: [
- "bluetooth/metrics/bluetooth.proto",
"bluetooth/bluetoothKeystore/keystore.proto",
+ "bluetooth/metrics/bluetooth.proto",
],
apex_available: [
"com.android.btservices",
@@ -32,8 +32,8 @@ cc_library_static {
type: "lite",
},
srcs: [
- "bluetooth/metrics/bluetooth.proto",
"bluetooth/bluetoothKeystore/keystore.proto",
+ "bluetooth/metrics/bluetooth.proto",
],
apex_available: [
"com.android.btservices",
@@ -50,8 +50,8 @@ cc_library_static {
include_dirs: ["external/protobuf/src"],
},
srcs: [
- "bluetooth/metrics/bluetooth.proto",
"bluetooth/bluetoothKeystore/keystore.proto",
+ "bluetooth/metrics/bluetooth.proto",
],
apex_available: [
"com.android.btservices",
diff --git a/system/gd/rust/common/Android.bp b/system/gd/rust/common/Android.bp
index 5905108abc9fa73461fc8f6ddba692889e2c8c32..fd889115dfad4e555f21cc63bb034dc259eb1bf7 100644
--- a/system/gd/rust/common/Android.bp
+++ b/system/gd/rust/common/Android.bp
@@ -11,12 +11,12 @@ rust_library {
name: "libbt_common",
defaults: ["libbt_common_defaults"],
rustlibs: [
- "libtokio",
- "libnix",
- "liblazy_static",
- "liblog_rust",
"libcxx",
"libgrpcio",
+ "liblazy_static",
+ "liblog_rust",
+ "libnix",
+ "libtokio",
],
target: {
android: {
@@ -47,19 +47,19 @@ rust_defaults {
crate_name: "bt_common",
srcs: ["src/lib.rs"],
rustlibs: [
- "libtokio",
- "libnix",
- "liblazy_static",
- "liblog_rust",
- "libcxx",
- "libgrpcio",
+ "libbt_facade_helpers",
"libbt_packets",
+ "libcxx",
+ "libenv_logger",
"libfutures",
- "libnum_traits",
- "libnix",
+ "libgrpcio",
+ "liblazy_static",
"liblog_rust",
- "libbt_facade_helpers",
- "libenv_logger",
+ "liblog_rust",
+ "libnix",
+ "libnix",
+ "libnum_traits",
+ "libtokio",
],
proc_macros: [
"libpaste",
@@ -75,8 +75,8 @@ rust_ffi_static {
target: {
android: {
rustlibs: [
- "librustutils",
"libandroid_logger",
+ "librustutils",
],
},
},
@@ -90,15 +90,15 @@ cc_library_static {
name: "libbt_common_bridge",
defaults: ["gd_ffi_defaults"],
generated_headers: [
- "libbt_common_bridge_header",
"cxx-bridge-header",
+ "libbt_common_bridge_header",
],
generated_sources: [
"libbt_common_bridge_code",
],
export_generated_headers: [
- "libbt_common_bridge_header",
"cxx-bridge-header",
+ "libbt_common_bridge_header",
],
include_dirs: [
"packages/modules/Bluetooth/system/gd",
@@ -123,14 +123,14 @@ cc_library_static {
cc_library_static {
name: "libbt_keystore_cc",
defaults: [
- "rust_static_cc_lib_defaults",
"gd_ffi_defaults",
+ "rust_static_cc_lib_defaults",
],
header_libs: ["libbt_keystore_cc_headers"],
srcs: ["keystore/fake_bt_keystore.cc"],
generated_headers: [
- "libbt_common_bridge_header",
"cxx-bridge-header",
+ "libbt_common_bridge_header",
],
generated_sources: ["libbt_common_bridge_code"],
shared_libs: [
@@ -193,15 +193,15 @@ rust_test_host {
test_suites: ["general-tests"],
auto_gen_config: true,
rustlibs: [
- "libtokio",
- "libnix",
- "liblazy_static",
- "liblog_rust",
- "libfutures",
- "libenv_logger",
- "libgrpcio",
"libbt_common",
"libcxx",
+ "libenv_logger",
+ "libfutures",
+ "libgrpcio",
+ "liblazy_static",
+ "liblog_rust",
+ "libnix",
+ "libtokio",
],
proc_macros: [
"libpaste",
diff --git a/system/gd/rust/facade/Android.bp b/system/gd/rust/facade/Android.bp
index d64ecf072691abada0754ff6797f6feb2c0408c9..4444ccfce342d2daa0c6e8f3c7a380345fd631cf 100644
--- a/system/gd/rust/facade/Android.bp
+++ b/system/gd/rust/facade/Android.bp
@@ -17,11 +17,11 @@ rust_library {
"libbluetooth_rs",
"libbt_facade_proto",
"libfutures",
+ "libgddi",
"libgrpcio",
+ "liblog_rust",
"libprotobuf_deprecated",
"libtokio",
- "libgddi",
- "liblog_rust",
],
}
@@ -31,15 +31,15 @@ rust_binary {
srcs: ["src/main.rs"],
edition: "2018",
rustlibs: [
- "libclap",
"libbluetooth_with_facades",
+ "libbt_common",
+ "libclap",
"libfutures",
"libgrpcio",
"liblazy_static",
- "libtokio",
- "libnix",
- "libbt_common",
"liblog_rust",
+ "libnix",
+ "libtokio",
],
}
@@ -49,15 +49,15 @@ rust_test {
srcs: ["src/main.rs"],
edition: "2018",
rustlibs: [
- "libclap",
"libbluetooth_with_facades",
+ "libbt_common",
+ "libclap",
"libfutures",
"libgrpcio",
"liblazy_static",
- "libtokio",
- "libnix",
- "libbt_common",
"liblog_rust",
+ "libnix",
+ "libtokio",
],
test_suites: ["general-tests"],
}
@@ -71,12 +71,12 @@ rust_library {
rustlibs: [
"libbt_facade_proto",
"libbytes",
+ "libcxx",
"libfutures",
"libgrpcio",
- "libtokio",
- "libprotobuf_deprecated",
"liblog_rust",
- "libcxx",
+ "libprotobuf_deprecated",
+ "libtokio",
],
apex_available: [
"com.android.btservices",
diff --git a/system/gd/rust/shim/Android.bp b/system/gd/rust/shim/Android.bp
index 700b0cb4910c4d7bfdd2878a22561ac9f637264c..2f0e5ff649f2889e2afdd769916a643872f7cab3 100644
--- a/system/gd/rust/shim/Android.bp
+++ b/system/gd/rust/shim/Android.bp
@@ -73,21 +73,21 @@ cc_library_static {
"libchrome_support_defaults",
],
generated_headers: [
+ "cxx-bridge-header",
"libbt_init_flags_bridge_header",
- "libbt_shim_bridge_header",
"libbt_message_loop_thread_bridge_header",
- "cxx-bridge-header",
+ "libbt_shim_bridge_header",
],
generated_sources: [
"libbt_init_flags_bridge_code",
- "libbt_shim_bridge_code",
"libbt_message_loop_thread_bridge_code",
+ "libbt_shim_bridge_code",
],
export_generated_headers: [
+ "cxx-bridge-header",
"libbt_init_flags_bridge_header",
- "libbt_shim_bridge_header",
"libbt_message_loop_thread_bridge_header",
- "cxx-bridge-header",
+ "libbt_shim_bridge_header",
],
include_dirs: [
"packages/modules/Bluetooth/system/gd",
@@ -130,8 +130,8 @@ cc_library_static {
header_libs: ["libbt_callbacks_cxx_headers"],
srcs: ["callbacks/callbacks.cc"],
generated_headers: [
- "libbt_shim_bridge_header",
"cxx-bridge-header",
+ "libbt_shim_bridge_header",
],
host_supported: true,
apex_available: [
diff --git a/system/gd/rust/stack/Android.bp b/system/gd/rust/stack/Android.bp
index c2a25ea9b13e788c779db170b36c461c44e027d8..6e0c5c67f8941d0092cc9a29cbbeeebdf1a54f89 100644
--- a/system/gd/rust/stack/Android.bp
+++ b/system/gd/rust/stack/Android.bp
@@ -14,23 +14,23 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
+ "libbt_common",
+ "libbt_facade_helpers",
"libbt_facade_proto",
"libbt_packets",
+ "libbt_packets",
"libbytes",
+ "libcxx",
"libfutures",
- "libthiserror",
- "libgrpcio",
- "libtokio",
- "libtokio_stream",
- "libprotobuf_deprecated",
- "libbt_packets",
"libgddi",
- "libcxx",
+ "libgrpcio",
"liblazy_static",
"liblog_rust",
- "libbt_common",
"libnum_traits",
- "libbt_facade_helpers",
+ "libprotobuf_deprecated",
+ "libthiserror",
+ "libtokio",
+ "libtokio_stream",
],
proc_macros: [
"libnum_derive",
@@ -62,23 +62,23 @@ rust_test_host {
test_suites: ["general-tests"],
edition: "2018",
rustlibs: [
+ "libbluetooth_rs",
+ "libbt_common",
+ "libbt_facade_helpers",
"libbt_facade_proto",
"libbt_packets",
- "libbluetooth_rs",
"libbytes",
+ "libcxx",
"libfutures",
- "libthiserror",
- "libgrpcio",
- "libtokio",
- "libtokio_stream",
- "libprotobuf_deprecated",
"libgddi",
- "libcxx",
+ "libgrpcio",
"liblazy_static",
"liblog_rust",
- "libbt_common",
"libnum_traits",
- "libbt_facade_helpers",
+ "libprotobuf_deprecated",
+ "libthiserror",
+ "libtokio",
+ "libtokio_stream",
],
proc_macros: [
"libnum_derive",
@@ -104,16 +104,16 @@ genrule {
cc_library_static {
name: "libbt_hidl_hal_cxx",
defaults: [
- "rust_static_cc_lib_defaults",
- "gd_ffi_defaults",
"fluoride_common_options",
+ "gd_ffi_defaults",
+ "rust_static_cc_lib_defaults",
],
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",
+ "libbt_hidl_hal_bridge_header",
],
generated_sources: ["libbt_hidl_hal_bridge_code"],
shared_libs: [
diff --git a/system/gd/rust/topshim/Android.bp b/system/gd/rust/topshim/Android.bp
index e5f40f6e4a80ed7e7fe667c01ca78ac5c4b740c8..ba99436733e62547a1eea87d57df7c5d796a0e14 100644
--- a/system/gd/rust/topshim/Android.bp
+++ b/system/gd/rust/topshim/Android.bp
@@ -13,6 +13,7 @@ rust_library_host_rlib {
crate_name: "bt_topshim",
srcs: [
"src/lib.rs",
+
":libbt_topshim_wrapper_bindgen",
],
rustlibs: [
@@ -51,16 +52,16 @@ cc_library_static {
"btav/btav_shim.cc",
"btav_sink/btav_sink_shim.cc",
"btif/btif_shim.cc",
- "gatt/gatt_shim.cc",
- "gatt/gatt_ble_scanner_shim.cc",
+ "controller/controller_shim.cc",
"gatt/gatt_ble_advertiser_shim.cc",
+ "gatt/gatt_ble_scanner_shim.cc",
+ "gatt/gatt_shim.cc",
"hfp/hfp_shim.cc",
- "controller/controller_shim.cc",
],
generated_headers: [
+ "cxx-bridge-header",
"libbt_init_flags_bridge_header",
"libbt_topshim_bridge_header",
- "cxx-bridge-header",
],
generated_sources: ["libbt_topshim_bridge_code"],
include_dirs: [
@@ -79,11 +80,11 @@ gensrcs {
cmd: "$(location cxxbridge) $(in) --header > $(out)",
srcs: [
"src/btif.rs",
+ "src/controller.rs",
"src/profiles/a2dp.rs",
"src/profiles/avrcp.rs",
- "src/profiles/hfp.rs",
"src/profiles/gatt.rs",
- "src/controller.rs",
+ "src/profiles/hfp.rs",
],
output_extension: "rs.h",
export_include_dirs: ["."],
@@ -95,11 +96,11 @@ gensrcs {
cmd: "$(location cxxbridge) $(in) > $(out)",
srcs: [
"src/btif.rs",
+ "src/controller.rs",
"src/profiles/a2dp.rs",
"src/profiles/avrcp.rs",
- "src/profiles/hfp.rs",
"src/profiles/gatt.rs",
- "src/controller.rs",
+ "src/profiles/hfp.rs",
],
output_extension: "cc",
export_include_dirs: ["."],
@@ -113,27 +114,27 @@ rust_bindgen {
cpp_std: "c++17",
host_supported: true,
bindgen_flags: [
- "--size_t-is-usize",
"--allowlist-function=bt_.*",
- "--allowlist-function=bthh_.*",
"--allowlist-function=btgatt_.*",
+ "--allowlist-function=bthh_.*",
"--allowlist-function=btsdp.*",
"--allowlist-function=hal_util_.*",
"--allowlist-function=osi_property_get.*",
+ "--allowlist-type=bluetooth_sdp.*",
"--allowlist-type=bt_.*",
- "--allowlist-type=bthh_.*",
"--allowlist-type=btgatt_.*",
- "--allowlist-type=bluetooth_sdp.*",
- "--allowlist-type=btsdp.*",
- "--allowlist-type=btsock_.*",
"--allowlist-type=bthf_.*",
+ "--allowlist-type=bthh_.*",
"--allowlist-type=btrc_.*",
+ "--allowlist-type=btsdp.*",
+ "--allowlist-type=btsock_.*",
"--allowlist-type=sock_connect_signal_t",
"--enable-cxx-namespaces",
"--opaque-type=std::.*",
+ "--size_t-is-usize",
"--with-derive-default",
- "--with-derive-partialeq",
"--with-derive-eq",
+ "--with-derive-partialeq",
],
shared_libs: [
"libc++",
diff --git a/system/gd/rust/topshim/facade/Android.bp b/system/gd/rust/topshim/facade/Android.bp
index 0da12c44892dd9b2dffff9bfbb887224f029f34f..711300e9253426e968f60b3335dfbe6d53e73015 100644
--- a/system/gd/rust/topshim/facade/Android.bp
+++ b/system/gd/rust/topshim/facade/Android.bp
@@ -16,17 +16,17 @@ rust_defaults {
crate_name: "bt_topshim_facade",
srcs: ["src/main.rs"],
ld_flags: [
- "-fsanitize=undefined",
"-fsanitize-minimal-runtime",
+ "-fsanitize=undefined",
],
rustlibs: [
"libbluetooth_rs",
"libbt_common",
"libbt_facade_helpers",
"libbt_packets",
+ "libbt_shim",
"libbt_topshim",
"libbt_topshim_facade_protobuf",
- "libbt_shim",
"libclap",
"libfutures",
"libgrpcio",
@@ -41,46 +41,46 @@ rust_defaults {
"lib-bt-packets",
"lib-bt-packets-avrcp",
"lib-bt-packets-base",
- "libchrome",
- "libevent",
- "libbt_topshim_cxx",
+ "libFraunhoferAAC",
+ "libaudio-a2dp-hw-utils",
+ "libbluetooth-dumpsys",
+ "libbluetooth-types",
+ "libbluetooth_gd", // Gabeldorsche
+ "libbt-audio-hal-interface",
"libbt-bta",
"libbt-bta-core",
"libbt-common",
- "libbtdevice",
- "libbtif",
- "libbtif-core",
"libbt-hci",
+ "libbt-protos-lite",
+ "libbt-sbc-decoder",
+ "libbt-sbc-encoder",
"libbt-stack",
"libbt-stack-core",
+ "libbt_shim_bridge",
+ "libbt_topshim_cxx",
+ "libbt_topshim_cxx",
"libbtcore",
- "libbthalutils",
- "libosi",
- "libbt-protos-lite",
+ "libbtdevice",
"libbte",
- "libbt-sbc-decoder",
- "libbt-sbc-encoder",
- "libFraunhoferAAC",
+ "libbthalutils",
+ "libbtif",
+ "libbtif-core",
+ "libc++fs",
+ "libchrome",
+ "libevent",
+ "libflatbuffers-cpp",
"libg722codec",
"liblc3",
"libopus",
+ "libosi",
"libudrv-uipc",
- "libbluetooth_gd", // Gabeldorsche
- "libbluetooth-dumpsys",
- "libbluetooth-types",
- "libflatbuffers-cpp",
- "libbt_shim_bridge",
- "libbt_topshim_cxx",
- "libbt-audio-hal-interface",
- "libaudio-a2dp-hw-utils",
- "libc++fs",
],
shared_libs: [
"libcrypto",
- "liblog",
"libcutils",
"libgrpc++",
"libgrpc_wrap",
+ "liblog",
],
proc_macros: [
"libpaste",
diff --git a/system/gd/security/Android.bp b/system/gd/security/Android.bp
index b8ffc43993b777e56850ab5d8bf50263a7961c8f..4432bc420768ab50f07acdbd5c02f039eb32d140 100644
--- a/system/gd/security/Android.bp
+++ b/system/gd/security/Android.bp
@@ -10,20 +10,20 @@ package {
filegroup {
name: "BluetoothSecuritySources",
srcs: [
+ ":BluetoothSecurityChannelSources",
+ ":BluetoothSecurityPairingSources",
+ ":BluetoothSecurityRecordSources",
"ecc/multprecision.cc",
"ecc/p_256_ecc_pp.cc",
"ecdh_keys.cc",
"facade_configuration_api.cc",
+ "internal/security_manager_impl.cc",
"l2cap_security_module_interface.cc",
"pairing_handler_le.cc",
"pairing_handler_le_legacy.cc",
"pairing_handler_le_secure_connections.cc",
"security_manager.cc",
- "internal/security_manager_impl.cc",
"security_module.cc",
- ":BluetoothSecurityChannelSources",
- ":BluetoothSecurityPairingSources",
- ":BluetoothSecurityRecordSources",
],
}
@@ -38,12 +38,12 @@ filegroup {
filegroup {
name: "BluetoothSecurityTestSources",
srcs: [
- "pairing_handler_le_unittest.cc",
- "test/fake_l2cap_test.cc",
- "test/pairing_handler_le_pair_test.cc",
":BluetoothSecurityChannelTestSources",
":BluetoothSecurityPairingTestSources",
":BluetoothSecurityRecordTestSources",
+ "pairing_handler_le_unittest.cc",
+ "test/fake_l2cap_test.cc",
+ "test/pairing_handler_le_pair_test.cc",
],
}
diff --git a/system/gd/shim/Android.bp b/system/gd/shim/Android.bp
index 838eaa4583aedf95a9f29b6482c731e8c026a1b0..f5f72f230d4d67a8dd21fa4ea7521f7a94267428 100644
--- a/system/gd/shim/Android.bp
+++ b/system/gd/shim/Android.bp
@@ -18,8 +18,8 @@ filegroup {
filegroup {
name: "BluetoothShimTestSources",
srcs: [
- "dumpsys_test.cc",
"dumpsys_args_test.cc",
+ "dumpsys_test.cc",
],
}
diff --git a/system/gd/storage/Android.bp b/system/gd/storage/Android.bp
index 116dd146d1abe1b8b22a0c678831220a004654ab..0257d97e9ec1389869ae9364d5787036f4a4095a 100644
--- a/system/gd/storage/Android.bp
+++ b/system/gd/storage/Android.bp
@@ -28,8 +28,8 @@ filegroup {
srcs: [
"adapter_config_test.cc",
"classic_device_test.cc",
- "config_cache_test.cc",
"config_cache_helper_test.cc",
+ "config_cache_test.cc",
"device_test.cc",
"le_device_test.cc",
"legacy_config_file_test.cc",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 1c4e112dca5e73b72ab17fed2f2c5c5192134722..4bf079c1583ac857e5e54d5efb2f75b56d4f5adf 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -65,8 +65,8 @@ cc_library_static {
"include_internal",
],
defaults: [
- "fluoride_osi_defaults",
"fluoride_basic_defaults",
+ "fluoride_osi_defaults",
],
// TODO(mcchou): Remove socket_utils sources after platform specific
// dependencies are abstracted.
@@ -104,8 +104,8 @@ cc_library_static {
target: {
host_linux: {
cflags: [
- "-D_GNU_SOURCE",
"-DOS_GENERIC",
+ "-D_GNU_SOURCE",
],
},
},
@@ -123,9 +123,9 @@ cc_test {
name: "net_test_osi",
test_suites: ["device-tests"],
defaults: [
+ "bluetooth_gtest_x86_asan_workaround",
"fluoride_osi_defaults",
"mts_defaults",
- "bluetooth_gtest_x86_asan_workaround",
],
host_supported: true,
srcs: [
@@ -145,18 +145,17 @@ cc_test {
"test/reactor_test.cc",
"test/ringbuffer_test.cc",
"test/thread_test.cc",
- "test/wakelock_test.cc",
+ "test/wakelock_test.cc", // test internal sources only used inside the libosi
- // test internal sources only used inside the libosi
"test/internal/semaphore_test.cc",
],
shared_libs: [
"android.hardware.bluetooth@1.0",
"android.hardware.bluetooth@1.1",
"libbase",
- "liblog",
- "libcutils",
"libcrypto",
+ "libcutils",
+ "liblog",
],
local_include_dirs: [
"include_internal",
@@ -165,10 +164,10 @@ cc_test {
static_libs: [
"libbt-common",
"libbt-protos-lite",
+ "libc++fs",
"libgmock",
"libosi",
"libprotobuf-cpp-lite",
- "libc++fs",
],
target: {
host_linux: {
diff --git a/system/osi/test/fuzzers/alarm/Android.bp b/system/osi/test/fuzzers/alarm/Android.bp
index f26951ec109caed0f637fbb7c2e62d9decd129c3..bd156193ad9e176b4dba2f1a0214b5b95da67bba 100644
--- a/system/osi/test/fuzzers/alarm/Android.bp
+++ b/system/osi/test/fuzzers/alarm/Android.bp
@@ -15,10 +15,10 @@ cc_fuzz {
"fuzz_alarm.cc",
],
shared_libs: [
+ "libcrypto",
+ "libcutils",
"liblog",
"libprotobuf-cpp-lite",
- "libcutils",
- "libcrypto",
],
static_libs: [
"libbt-common",
diff --git a/system/osi/test/fuzzers/allocator/Android.bp b/system/osi/test/fuzzers/allocator/Android.bp
index 708d6152c906f60f16b4880e3a934451a39b0c83..60a221e856f3bbb0b711598fc3f8fe1f91281a14 100644
--- a/system/osi/test/fuzzers/allocator/Android.bp
+++ b/system/osi/test/fuzzers/allocator/Android.bp
@@ -15,7 +15,7 @@ cc_fuzz {
"fuzz_allocator.cc",
],
static_libs: [
- "libosi",
"liblog",
+ "libosi",
],
}
diff --git a/system/osi/test/fuzzers/compat/Android.bp b/system/osi/test/fuzzers/compat/Android.bp
index 97e8b2bf4f3e885c39f378b10331b3c7566fa352..50a680a49251031d9551ec3adaf80630adedea7b 100644
--- a/system/osi/test/fuzzers/compat/Android.bp
+++ b/system/osi/test/fuzzers/compat/Android.bp
@@ -15,8 +15,8 @@ cc_fuzz {
"fuzz_compat.cc",
],
shared_libs: [
- "liblog",
"libcutils",
+ "liblog",
],
static_libs: [
"libosi",
diff --git a/system/osi/test/fuzzers/fixed_queue/Android.bp b/system/osi/test/fuzzers/fixed_queue/Android.bp
index 5231552c3c7edd227bce9a12c502cdd43ce4fc91..987a7aa898c61baba62b9418fb7297bb28291421 100644
--- a/system/osi/test/fuzzers/fixed_queue/Android.bp
+++ b/system/osi/test/fuzzers/fixed_queue/Android.bp
@@ -15,8 +15,8 @@ cc_fuzz {
"fuzz_fixed_queue.cc",
],
shared_libs: [
- "liblog",
"libcutils",
+ "liblog",
],
static_libs: [
"libosi",
diff --git a/system/osi/test/fuzzers/future/Android.bp b/system/osi/test/fuzzers/future/Android.bp
index c3ac34e424fb019f10f0511b68d0ba68029d68f8..40bec647ed4ef46acc9909f78a004da829c840c9 100644
--- a/system/osi/test/fuzzers/future/Android.bp
+++ b/system/osi/test/fuzzers/future/Android.bp
@@ -15,8 +15,8 @@ cc_fuzz {
"fuzz_future.cc",
],
shared_libs: [
- "liblog",
"libcutils",
+ "liblog",
],
static_libs: [
"libosi",
diff --git a/system/osi/test/fuzzers/list/Android.bp b/system/osi/test/fuzzers/list/Android.bp
index a4475358c02d67926e823a69b878a761a973d411..e80e2dc9a1926a084d06eb273fea033b6a79b9a2 100644
--- a/system/osi/test/fuzzers/list/Android.bp
+++ b/system/osi/test/fuzzers/list/Android.bp
@@ -15,7 +15,7 @@ cc_fuzz {
"fuzz_list.cc",
],
static_libs: [
- "libosi",
"liblog",
+ "libosi",
],
}
diff --git a/system/osi/test/fuzzers/ringbuffer/Android.bp b/system/osi/test/fuzzers/ringbuffer/Android.bp
index 6fef439b9a50e08c318daf3a5fe3648118c5d975..6fb3982e239500c7a2cdfca1b4c544bee837f03d 100644
--- a/system/osi/test/fuzzers/ringbuffer/Android.bp
+++ b/system/osi/test/fuzzers/ringbuffer/Android.bp
@@ -15,7 +15,7 @@ cc_fuzz {
"fuzz_ringbuffer.cc",
],
static_libs: [
- "libosi",
"liblog",
+ "libosi",
],
}
diff --git a/system/rust/Android.bp b/system/rust/Android.bp
index f72810854f7ac60ae16a7c2b506ed7d4f7f0871b..95bca4ffd5bd53720aff84fccfcdf824c537789e 100644
--- a/system/rust/Android.bp
+++ b/system/rust/Android.bp
@@ -15,6 +15,7 @@ rust_defaults {
},
srcs: [
"src/lib.rs",
+
":bluetooth_core_rust_packets",
],
shared_libs: [
diff --git a/tools/pdl/Android.bp b/tools/pdl/Android.bp
index 12ec2d107b090b8737b6e45602af307555c4e051..134febc238be0a803f41ba8f55b0b2d59537b12f 100644
--- a/tools/pdl/Android.bp
+++ b/tools/pdl/Android.bp
@@ -431,6 +431,7 @@ rust_test_host {
name: "pdl_rust_noalloc_le_test",
srcs: [
":pdl_rust_noalloc_le_test_gen_harness",
+
":pdl_rust_noalloc_le_test_backend_srcs",
],
test_suites: ["general-tests"],
diff --git a/tools/rootcanal/Android.bp b/tools/rootcanal/Android.bp
index 97eb5a3aabf09e21f7c8fd92ae7b7840f12a3099..74eae2b67732131be504aa601e5ffc0596abaeb0 100644
--- a/tools/rootcanal/Android.bp
+++ b/tools/rootcanal/Android.bp
@@ -19,6 +19,7 @@ cc_defaults {
tidy_checks: [
"-*",
"readability-*",
+
"-readability-function-size",
"-readability-identifier-length",
"-readability-implicit-bool-conversion",
diff --git a/tools/rootcanal/lmp/Android.bp b/tools/rootcanal/lmp/Android.bp
index 791741390fd7fe203e557878a624533055b9375a..aecd3ca23a56a82ffeaeaef0a2d675560204e398 100644
--- a/tools/rootcanal/lmp/Android.bp
+++ b/tools/rootcanal/lmp/Android.bp
@@ -14,6 +14,7 @@ rust_ffi {
crate_name: "lmp",
srcs: [
"src/lib.rs",
+
":LmpGeneratedPackets_rust",
],
edition: "2018",
@@ -50,6 +51,7 @@ rust_test_host {
crate_name: "lmp",
srcs: [
"src/lib.rs",
+
":LmpGeneratedPackets_rust",
],
auto_gen_config: true,