bpfmt -w $(find . -name Android.bp)

Test: none
Change-Id: If38ad50d848c9e40f07c6598272a354312d9efea

Android.bp

@@ -28,8 +28,8 @@ subdirs = [
 ]
 
 filegroup {
-  name: "BluetoothTestConfigTemplate",
-  srcs: [
-    "AndroidTestTemplate.xml"
-  ]
+    name: "BluetoothTestConfigTemplate",
+    srcs: [
+        "AndroidTestTemplate.xml",
+    ],
 }

audio_a2dp_hw/Android.bp

@@ -5,7 +5,7 @@ cc_defaults {
         "system/bt",
         "system/bt/include",
         "system/bt/audio_a2dp_hw/include",
-    ]
+    ],
 }
 
 // Audio A2DP shared library for target

audio_hearing_aid_hw/Android.bp

@@ -5,7 +5,7 @@ cc_defaults {
         "system/bt",
         "system/bt/include",
         "system/bt/audio_hearing_aid_hw/include",
-    ]
+    ],
 }
 
 // Audio A2DP shared library for target

binder/Android.bp

@@ -9,7 +9,7 @@ cc_library_shared {
         "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 @@ cc_library_shared {
         "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",
         ],

btif/Android.bp

@@ -172,8 +172,8 @@ cc_test {
     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: [

build/Android.bp

@@ -58,7 +58,7 @@ fluoride_defaults {
     target: {
         android: {
             test_config_template: ":BluetoothTestConfigTemplate",
-        }
+        },
     },
     defaults: ["fluoride_types_defaults"],
     header_libs: ["libbluetooth_headers"],

common/Android.bp

@@ -37,7 +37,7 @@ cc_test {
         "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 @@ cc_test {
         "libprotobuf-cpp-lite",
         "libcrypto",
     ],
-    static_libs : [
+    static_libs: [
         "libgmock",
         "libbt-common",
         "libbt-protos-lite",
@@ -77,7 +77,7 @@ cc_test {
     static_libs: [
         "libgmock",
         "libosi",
-        "libbt-common"
+        "libbt-common",
     ],
 }
 
@@ -97,7 +97,7 @@ cc_benchmark {
     ],
     static_libs: [
         "libosi",
-        "libbt-common"
+        "libbt-common",
     ],
 }
 

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",
     ],
-}
+}

gd/Android.bp

@@ -8,15 +8,15 @@ cc_defaults {
                 "-DOS_LINUX_GENERIC",
             ],
             shared_libs: [
-                "liblog"
-            ]
+                "liblog",
+            ],
         },
         host: {
             cflags: [
                 "-DOS_LINUX",
                 "-DOS_LINUX_GENERIC",
-            ]
-        }
+            ],
+        },
     },
     cpp_std: "c++17",
     cflags: [
@@ -236,10 +236,10 @@ cc_test {
         ":BluetoothL2capTestSources",
         ":BluetoothPacketTestSources",
     ],
-    generated_headers : [
+    generated_headers: [
         "BluetoothGeneratedPackets_h",
     ],
-    static_libs : [
+    static_libs: [
         "libbluetooth_gd",
     ],
     sanitize: {
@@ -260,7 +260,7 @@ cc_test {
         ":BluetoothPacketSources",
         ":BluetoothPacketParserTestPacketTestSources",
     ],
-    generated_headers : [
+    generated_headers: [
         "BluetoothPacketParserTestPacketPdlGen_h",
     ],
     sanitize: {
@@ -277,7 +277,7 @@ cc_benchmark {
         "benchmark.cc",
         ":BluetoothOsBenchmarkSources",
     ],
-    static_libs : [
+    static_libs: [
         "libbluetooth_gd",
     ],
 }
@@ -395,7 +395,7 @@ genrule {
     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 @@ genrule {
     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",

gd/common/Android.bp

@@ -3,7 +3,7 @@ filegroup {
     srcs: [
         "address.cc",
         "class_of_device.cc",
-    ]
+    ],
 }
 
 filegroup {
@@ -12,6 +12,6 @@ filegroup {
         "address_unittest.cc",
         "blocking_queue_unittest.cc",
         "class_of_device_unittest.cc",
-        "bidi_queue_unittest.cc"
-    ]
+        "bidi_queue_unittest.cc",
+    ],
 }

gd/os/Android.bp

@@ -7,7 +7,7 @@ filegroup {
         "linux_generic/repeating_alarm.cc",
         "linux_generic/reactive_semaphore.cc",
         "linux_generic/thread.cc",
-    ]
+    ],
 }
 
 filegroup {
@@ -19,7 +19,7 @@ filegroup {
         "linux_generic/reactor_unittest.cc",
         "linux_generic/repeating_alarm_unittest.cc",
         "linux_generic/thread_unittest.cc",
-    ]
+    ],
 }
 
 filegroup {
@@ -28,5 +28,5 @@ filegroup {
         "alarm_benchmark.cc",
         "thread_benchmark.cc",
         "queue_benchmark.cc",
-    ]
+    ],
 }

gd/packet/Android.bp

@@ -2,8 +2,8 @@ filegroup {
     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",

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,
+    },
 }

internal_include/Android.bp

@@ -3,4 +3,4 @@ cc_library_headers {
     export_include_dirs: ["./"],
     vendor_available: true,
     host_supported: true,
-}
+}

main/Android.bp

@@ -1,4 +1,3 @@
-
 // Bluetooth main HW module / shared library for target
 // ========================================================
 cc_library_shared {

osi/Android.bp

@@ -6,7 +6,7 @@ cc_defaults {
         "system/bt/internal_include",
         "system/bt/utils/include",
         "system/bt/stack/include",
-    ]
+    ],
 }
 
 // Static libraries required by other modules
@@ -19,7 +19,7 @@ cc_test_library {
     ],
     host_supported: true,
     shared: {
-        enabled: false
+        enabled: false,
     },
 }
 
@@ -31,7 +31,7 @@ cc_test_library {
     ],
     host_supported: true,
     shared: {
-        enabled: false
+        enabled: false,
     },
 }
 

profile/avrcp/Android.bp

@@ -2,7 +2,7 @@ cc_library_static {
     name: "avrcp-target-service",
     defaults: [
         "fluoride_defaults",
-        "clang_file_coverage"
+        "clang_file_coverage",
     ],
     host_supported: true,
     include_dirs: [