bpfmt -w $(find . -name Android.bp)
Test: none
Change-Id: If38ad50d848c9e40f07c6598272a354312d9efea
diff --git a/Android.bp b/Android.bp
index 49af99c..c56d51d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,8 +28,8 @@
]
filegroup {
- name: "BluetoothTestConfigTemplate",
- srcs: [
- "AndroidTestTemplate.xml"
- ]
+ name: "BluetoothTestConfigTemplate",
+ srcs: [
+ "AndroidTestTemplate.xml",
+ ],
}
diff --git a/audio_a2dp_hw/Android.bp b/audio_a2dp_hw/Android.bp
index 7a23e27..fac3655 100644
--- a/audio_a2dp_hw/Android.bp
+++ b/audio_a2dp_hw/Android.bp
@@ -5,7 +5,7 @@
"system/bt",
"system/bt/include",
"system/bt/audio_a2dp_hw/include",
- ]
+ ],
}
// Audio A2DP shared library for target
diff --git a/audio_hearing_aid_hw/Android.bp b/audio_hearing_aid_hw/Android.bp
index 229fc25..4ed9e76 100644
--- a/audio_hearing_aid_hw/Android.bp
+++ b/audio_hearing_aid_hw/Android.bp
@@ -5,7 +5,7 @@
"system/bt",
"system/bt/include",
"system/bt/audio_hearing_aid_hw/include",
- ]
+ ],
}
// Audio A2DP shared library for target
diff --git a/binder/Android.bp b/binder/Android.bp
index cff166b..9e1695c 100644
--- a/binder/Android.bp
+++ b/binder/Android.bp
@@ -9,7 +9,7 @@
"android/bluetooth/bluetooth_device.cc",
"android/bluetooth/IBluetoothSocketManager.aidl",
"android/os/parcel_uuid.cc",
-/* TODO: Uncomment this files as they get converted one-by-one into native implementation
+ /* TODO: Uncomment this files as they get converted one-by-one into native implementation
"android/bluetooth/IBluetooth.aidl",
"android/bluetooth/IBluetoothA2dp.aidl",
"android/bluetooth/IBluetoothA2dpSink.aidl",
@@ -40,15 +40,15 @@
"android/bluetooth/le/IAdvertisingSetCallback.aidl",
"android/bluetooth/le/IPeriodicAdvertisingCallback.aidl",
"android/bluetooth/le/IScannerCallback.aidl"
-*/
- ],
- export_include_dirs: [ "./"],
+ */
+ ],
+ export_include_dirs: ["./"],
aidl: {
export_aidl_headers: true,
include_dirs: [
"frameworks/native/aidl/binder",
- /* required for android.os.ParcelUuid, and android.os.ParcelFileDescriptor */
+ /* required for android.os.ParcelUuid, and android.os.ParcelFileDescriptor */
"frameworks/base/core/java",
"system/bt/binder",
],
diff --git a/btif/Android.bp b/btif/Android.bp
index cef01d7..1f781c9 100644
--- a/btif/Android.bp
+++ b/btif/Android.bp
@@ -172,8 +172,8 @@
test_suites: ["device-tests"],
include_dirs: btifCommonIncludes,
srcs: [
- "src/btif_profile_queue.cc",
- "test/btif_profile_queue_test.cc"
+ "src/btif_profile_queue.cc",
+ "test/btif_profile_queue_test.cc",
],
header_libs: ["libbluetooth_headers"],
shared_libs: [
diff --git a/build/Android.bp b/build/Android.bp
index cde9a36..c5ee79f 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -58,7 +58,7 @@
target: {
android: {
test_config_template: ":BluetoothTestConfigTemplate",
- }
+ },
},
defaults: ["fluoride_types_defaults"],
header_libs: ["libbluetooth_headers"],
diff --git a/common/Android.bp b/common/Android.bp
index 202559d..587b197 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -37,7 +37,7 @@
"system/bt",
"system/bt/stack/include",
],
- srcs : [
+ srcs: [
"address_obfuscator_unittest.cc",
"leaky_bonded_queue_unittest.cc",
"message_loop_thread_unittest.cc",
@@ -52,7 +52,7 @@
"libprotobuf-cpp-lite",
"libcrypto",
],
- static_libs : [
+ static_libs: [
"libgmock",
"libbt-common",
"libbt-protos-lite",
@@ -77,7 +77,7 @@
static_libs: [
"libgmock",
"libosi",
- "libbt-common"
+ "libbt-common",
],
}
@@ -97,7 +97,7 @@
],
static_libs: [
"libosi",
- "libbt-common"
+ "libbt-common",
],
}
diff --git a/embdrv/g722/Android.bp b/embdrv/g722/Android.bp
index cc635d8..fbac145 100644
--- a/embdrv/g722/Android.bp
+++ b/embdrv/g722/Android.bp
@@ -1,12 +1,11 @@
-
cc_library_static {
name: "libg722codec",
defaults: ["fluoride_defaults"],
cflags: [
- "-DG722_SUPPORT_MALLOC"
+ "-DG722_SUPPORT_MALLOC",
],
srcs: [
"g722_decode.cc",
"g722_encode.cc",
],
-}
\ No newline at end of file
+}
diff --git a/gd/Android.bp b/gd/Android.bp
index b7d853f..d84c9a3 100644
--- a/gd/Android.bp
+++ b/gd/Android.bp
@@ -8,15 +8,15 @@
"-DOS_LINUX_GENERIC",
],
shared_libs: [
- "liblog"
- ]
+ "liblog",
+ ],
},
host: {
cflags: [
"-DOS_LINUX",
"-DOS_LINUX_GENERIC",
- ]
- }
+ ],
+ },
},
cpp_std: "c++17",
cflags: [
@@ -236,10 +236,10 @@
":BluetoothL2capTestSources",
":BluetoothPacketTestSources",
],
- generated_headers : [
+ generated_headers: [
"BluetoothGeneratedPackets_h",
],
- static_libs : [
+ static_libs: [
"libbluetooth_gd",
],
sanitize: {
@@ -260,7 +260,7 @@
":BluetoothPacketSources",
":BluetoothPacketParserTestPacketTestSources",
],
- generated_headers : [
+ generated_headers: [
"BluetoothPacketParserTestPacketPdlGen_h",
],
sanitize: {
@@ -277,7 +277,7 @@
"benchmark.cc",
":BluetoothOsBenchmarkSources",
],
- static_libs : [
+ static_libs: [
"libbluetooth_gd",
],
}
@@ -395,7 +395,7 @@
cmd: "$(location aprotoc) -Isystem/bt/gd -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
srcs: [
":BluetoothCertStackProto",
- ":BluetoothFacadeProto", // we need to use facade/common.proto
+ ":BluetoothFacadeProto", // we need to use facade/common.proto
],
out: [
"cert/rootservice.grpc.pb.h",
@@ -416,7 +416,7 @@
cmd: "$(location aprotoc) -Isystem/bt/gd -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
srcs: [
":BluetoothCertStackProto",
- ":BluetoothFacadeProto", // we need to use facade/common.proto
+ ":BluetoothFacadeProto", // we need to use facade/common.proto
],
out: [
"cert/rootservice.grpc.pb.cc",
diff --git a/gd/common/Android.bp b/gd/common/Android.bp
index 656aa16..e9e0b25 100644
--- a/gd/common/Android.bp
+++ b/gd/common/Android.bp
@@ -3,7 +3,7 @@
srcs: [
"address.cc",
"class_of_device.cc",
- ]
+ ],
}
filegroup {
@@ -12,6 +12,6 @@
"address_unittest.cc",
"blocking_queue_unittest.cc",
"class_of_device_unittest.cc",
- "bidi_queue_unittest.cc"
- ]
+ "bidi_queue_unittest.cc",
+ ],
}
diff --git a/gd/os/Android.bp b/gd/os/Android.bp
index 8cd26fb..b8ad91a 100644
--- a/gd/os/Android.bp
+++ b/gd/os/Android.bp
@@ -7,7 +7,7 @@
"linux_generic/repeating_alarm.cc",
"linux_generic/reactive_semaphore.cc",
"linux_generic/thread.cc",
- ]
+ ],
}
filegroup {
@@ -19,7 +19,7 @@
"linux_generic/reactor_unittest.cc",
"linux_generic/repeating_alarm_unittest.cc",
"linux_generic/thread_unittest.cc",
- ]
+ ],
}
filegroup {
@@ -28,5 +28,5 @@
"alarm_benchmark.cc",
"thread_benchmark.cc",
"queue_benchmark.cc",
- ]
+ ],
}
diff --git a/gd/packet/Android.bp b/gd/packet/Android.bp
index 155fb4a..c65cf8c 100644
--- a/gd/packet/Android.bp
+++ b/gd/packet/Android.bp
@@ -2,8 +2,8 @@
name: "BluetoothPacketSources",
srcs: [
"bit_inserter.cc",
- "byte_inserter.cc",
- "byte_observer.cc",
+ "byte_inserter.cc",
+ "byte_observer.cc",
"iterator.cc",
"packet_view.cc",
"raw_builder.cc",
diff --git a/gd/packet/parser/Android.bp b/gd/packet/parser/Android.bp
index 4b24d2e..2dbaa4b 100644
--- a/gd/packet/parser/Android.bp
+++ b/gd/packet/parser/Android.bp
@@ -1,41 +1,41 @@
-cc_binary_host {
- name: "bluetooth_packetgen",
- srcs: [
- "fields/body_field.cc",
- "fields/checksum_field.cc",
- "fields/checksum_start_field.cc",
- "fields/custom_field.cc",
- "fields/enum_field.cc",
- "fields/fixed_field.cc",
- "fields/group_field.cc",
- "fields/packet_field.cc",
- "fields/payload_field.cc",
- "fields/reserved_field.cc",
- "fields/scalar_field.cc",
- "fields/size_field.cc",
- "checksum_def.cc",
- "custom_field_def.cc",
- "enum_def.cc",
- "enum_gen.cc",
- "packet_def.cc",
- "main.cc",
- "language_y.yy",
- "language_l.ll",
- ],
- static_libs: [
- "libc++fs",
- ],
- cppflags: [
- "-Wno-implicit-fallthrough",
- "-fno-exceptions",
- "-O0",
- ],
- ldflags: [
- "-fuse-ld=ld",
- "-O0",
- ],
- yacc: {
- gen_location_hh: true,
- gen_position_hh: true,
- },
+cc_binary_host {
+ name: "bluetooth_packetgen",
+ srcs: [
+ "fields/body_field.cc",
+ "fields/checksum_field.cc",
+ "fields/checksum_start_field.cc",
+ "fields/custom_field.cc",
+ "fields/enum_field.cc",
+ "fields/fixed_field.cc",
+ "fields/group_field.cc",
+ "fields/packet_field.cc",
+ "fields/payload_field.cc",
+ "fields/reserved_field.cc",
+ "fields/scalar_field.cc",
+ "fields/size_field.cc",
+ "checksum_def.cc",
+ "custom_field_def.cc",
+ "enum_def.cc",
+ "enum_gen.cc",
+ "packet_def.cc",
+ "main.cc",
+ "language_y.yy",
+ "language_l.ll",
+ ],
+ static_libs: [
+ "libc++fs",
+ ],
+ cppflags: [
+ "-Wno-implicit-fallthrough",
+ "-fno-exceptions",
+ "-O0",
+ ],
+ ldflags: [
+ "-fuse-ld=ld",
+ "-O0",
+ ],
+ yacc: {
+ gen_location_hh: true,
+ gen_position_hh: true,
+ },
}
diff --git a/internal_include/Android.bp b/internal_include/Android.bp
index 3ef202b..e550660 100644
--- a/internal_include/Android.bp
+++ b/internal_include/Android.bp
@@ -3,4 +3,4 @@
export_include_dirs: ["./"],
vendor_available: true,
host_supported: true,
-}
\ No newline at end of file
+}
diff --git a/main/Android.bp b/main/Android.bp
index 942ee9c..f90d89d 100644
--- a/main/Android.bp
+++ b/main/Android.bp
@@ -1,4 +1,3 @@
-
// Bluetooth main HW module / shared library for target
// ========================================================
cc_library_shared {
diff --git a/osi/Android.bp b/osi/Android.bp
index e6c95d0..bcdaf5f 100644
--- a/osi/Android.bp
+++ b/osi/Android.bp
@@ -6,7 +6,7 @@
"system/bt/internal_include",
"system/bt/utils/include",
"system/bt/stack/include",
- ]
+ ],
}
// Static libraries required by other modules
@@ -19,7 +19,7 @@
],
host_supported: true,
shared: {
- enabled: false
+ enabled: false,
},
}
@@ -31,7 +31,7 @@
],
host_supported: true,
shared: {
- enabled: false
+ enabled: false,
},
}
diff --git a/profile/avrcp/Android.bp b/profile/avrcp/Android.bp
index d452cb0..d73a5fb 100644
--- a/profile/avrcp/Android.bp
+++ b/profile/avrcp/Android.bp
@@ -2,7 +2,7 @@
name: "avrcp-target-service",
defaults: [
"fluoride_defaults",
- "clang_file_coverage"
+ "clang_file_coverage",
],
host_supported: true,
include_dirs: [
diff --git a/profile/sdp/Android.bp b/profile/sdp/Android.bp
index 9254337..5abd77b 100644
--- a/profile/sdp/Android.bp
+++ b/profile/sdp/Android.bp
@@ -1,40 +1,40 @@
cc_library_static {
- name: "sdp_service",
- defaults: [
- "fluoride_defaults",
- "clang_file_coverage"
- ],
- host_supported: true,
- include_dirs: [
- "system/bt/",
- ],
- srcs: [
- "common/data_element_reader.cc",
- ],
- static_libs: [
- "lib-bt-packets",
- "libbluetooth-types",
- ],
+ name: "sdp_service",
+ defaults: [
+ "fluoride_defaults",
+ "clang_file_coverage",
+ ],
+ host_supported: true,
+ include_dirs: [
+ "system/bt/",
+ ],
+ srcs: [
+ "common/data_element_reader.cc",
+ ],
+ static_libs: [
+ "lib-bt-packets",
+ "libbluetooth-types",
+ ],
}
cc_test {
- name: "bluetooth_test_sdp",
- test_suites: ["general-tests"],
- defaults: [
- "fluoride_defaults",
- "clang_coverage_bin",
- ],
- host_supported: true,
- include_dirs: [
- "system/bt/",
- ],
- srcs: [
- "common/test/data_element_reader_test.cc",
- ],
- static_libs: [
- "libgmock",
- "sdp_service",
- "lib-bt-packets",
- "libbluetooth-types",
- ],
+ name: "bluetooth_test_sdp",
+ test_suites: ["general-tests"],
+ defaults: [
+ "fluoride_defaults",
+ "clang_coverage_bin",
+ ],
+ host_supported: true,
+ include_dirs: [
+ "system/bt/",
+ ],
+ srcs: [
+ "common/test/data_element_reader_test.cc",
+ ],
+ static_libs: [
+ "libgmock",
+ "sdp_service",
+ "lib-bt-packets",
+ "libbluetooth-types",
+ ],
}
diff --git a/proto/Android.bp b/proto/Android.bp
index 0f97c72..c8a852d 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -16,4 +16,3 @@
},
srcs: ["bluetooth/metrics/bluetooth.proto"],
}
-
diff --git a/service/Android.bp b/service/Android.bp
index d57119a..4b21d0d 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -8,7 +8,7 @@
include_dirs: [
"system/bt",
],
- header_libs: [ "libbluetooth_headers" ],
+ header_libs: ["libbluetooth_headers"],
}
// Source variables
@@ -80,9 +80,9 @@
name: "bluetoothtbd",
defaults: ["fluoride_service_defaults"],
srcs: btserviceBinderDaemonSrc +
- btserviceLinuxSrc +
- btserviceDaemonSrc +
- ["main.cc"],
+ btserviceLinuxSrc +
+ btserviceDaemonSrc +
+ ["main.cc"],
static_libs: [
"libbluetooth-binder-common",
"libbtcore",
@@ -108,9 +108,9 @@
test_suites: ["device-tests"],
defaults: ["fluoride_service_defaults"],
srcs: btserviceBaseTestSrc +
- btserviceDaemonSrc + [
- "test/main.cc",
- ],
+ btserviceDaemonSrc + [
+ "test/main.cc",
+ ],
aidl: {
include_dirs: [
"system/bt/service/common",
diff --git a/service/common/Android.bp b/service/common/Android.bp
index fa63cf9..e3bde74 100644
--- a/service/common/Android.bp
+++ b/service/common/Android.bp
@@ -7,7 +7,7 @@
"-fvisibility=default",
],
host_supported: true,
- header_libs: [ "libbluetooth_headers" ],
+ header_libs: ["libbluetooth_headers"],
srcs: [
"bluetooth/a2dp_codec_config.cc",
"bluetooth/adapter_state.cc",
@@ -40,7 +40,7 @@
/* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
"-fvisibility=default",
],
- header_libs: [ "libbluetooth_headers" ],
+ header_libs: ["libbluetooth_headers"],
srcs: [
"android/bluetooth/IBluetooth.aidl",
"android/bluetooth/IBluetoothA2dpSink.aidl",
@@ -94,5 +94,5 @@
],
static_libs: [
"libbluetooth-types",
- ]
+ ],
}
diff --git a/test/suite/Android.bp b/test/suite/Android.bp
index b7ce070..85b46fa 100644
--- a/test/suite/Android.bp
+++ b/test/suite/Android.bp
@@ -36,7 +36,7 @@
"rfcomm/rfcomm_test.cc",
"rfcomm/rfcomm_unittest.cc",
],
- header_libs: [ "libhardware_headers" ],
+ header_libs: ["libhardware_headers"],
shared_libs: [
"liblog",
"libcutils",
diff --git a/udrv/Android.bp b/udrv/Android.bp
index 9bf1d83..4605c53 100644
--- a/udrv/Android.bp
+++ b/udrv/Android.bp
@@ -5,15 +5,15 @@
"ulinux/uipc.cc",
],
include_dirs: [
- "system/bt",
- "system/bt/internal_include",
- "system/bt/utils/include",
- "system/bt/stack/include",
+ "system/bt",
+ "system/bt/internal_include",
+ "system/bt/utils/include",
+ "system/bt/stack/include",
],
local_include_dirs: [
- "include",
+ "include",
],
shared_libs: [
- "liblog",
+ "liblog",
],
}
diff --git a/vendor_libs/linux/interface/Android.bp b/vendor_libs/linux/interface/Android.bp
index 8d6caa4..c4b6041 100644
--- a/vendor_libs/linux/interface/Android.bp
+++ b/vendor_libs/linux/interface/Android.bp
@@ -22,9 +22,12 @@
"h4_protocol.cc",
"bluetooth_hci.cc",
"async_fd_watcher.cc",
- "service.cc"
+ "service.cc",
],
- cflags: ["-Wall", "-Werror"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
header_libs: ["libbluetooth_headers"],
shared_libs: [
"android.hardware.bluetooth@1.0",
@@ -40,4 +43,3 @@
],
init_rc: ["android.hardware.bluetooth@1.0-service.btlinux.rc"],
}
-