[BP CLEANUP] Format bpfmt -s in framework,pandora,service,apex

Test: Build + Th + boot | This should be a no-op change
Bug: 277168419
Change-Id: I97ca96d5c8be1264792d0f3380f33c1239575dac

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

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,6 +96,7 @@ 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",
@@ -103,7 +104,6 @@ java_defaults {
         "framework",
         // if sdk_version="" this gets automatically included, but here we need to add manually.
         "framework-res",
-        "app-compat-annotations",
     ],
     defaults_visibility: ["//visibility:public"],
 }

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",

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",

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

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

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

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",
 

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",