From cdc9dbf348a99b94a9f750ffdb7e6191d8ac0f39 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Mon, 30 Jan 2023 19:04:33 +0000
Subject: [PATCH] AOSP: Android: run bpfmt on all bp files

Ran the following command:

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

Change-Id: Ia08c8d481199dfa917dbed2dc218df167f101ce5
From AOSP commit: 30fa5b9af82695711cc1bf749fbb0cd18afa008a
---
 Android.bp             | 5 ++++-
 debugfs/Android.bp     | 2 +-
 lib/Android.bp         | 1 -
 lib/support/Android.bp | 2 +-
 lib/uuid/Android.bp    | 2 +-
 misc/Android.bp        | 8 ++++++--
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Android.bp b/Android.bp
index 38b9bef..1e6aa1a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,7 +57,10 @@ cc_defaults {
     ],
     target: {
         bionic: {
-            system_shared_libs: ["libc", "libdl"],
+            system_shared_libs: [
+                "libc",
+                "libdl",
+            ],
         },
         windows: {
             include_dirs: ["external/e2fsprogs/include/mingw"],
diff --git a/debugfs/Android.bp b/debugfs/Android.bp
index 4c60a2d..4d087b3 100644
--- a/debugfs/Android.bp
+++ b/debugfs/Android.bp
@@ -46,7 +46,7 @@ cc_defaults {
     ],
     include_dirs: [
         "external/e2fsprogs/misc",
-        "external/e2fsprogs/e2fsck"
+        "external/e2fsprogs/e2fsck",
     ],
 }
 
diff --git a/lib/Android.bp b/lib/Android.bp
index fb0ea07..529fa23 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -40,7 +40,6 @@ cc_library_headers {
     ],
 }
 
-
 subdirs = [
     "*",
 ]
diff --git a/lib/support/Android.bp b/lib/support/Android.bp
index c54ca5f..af9b28d 100644
--- a/lib/support/Android.bp
+++ b/lib/support/Android.bp
@@ -39,7 +39,7 @@ cc_library {
 
     target: {
         windows: {
-            enabled: true
+            enabled: true,
         },
     },
 
diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp
index f8f0760..3e6048d 100644
--- a/lib/uuid/Android.bp
+++ b/lib/uuid/Android.bp
@@ -41,7 +41,7 @@ cc_library {
     ],
     target: {
         windows: {
-            enabled: true
+            enabled: true,
         },
     },
     header_libs: ["libext2-headers"],
diff --git a/misc/Android.bp b/misc/Android.bp
index 083ae68..0656bf4 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -81,7 +81,7 @@ cc_binary {
         },
         windows: {
             ldflags: ["-static"],
-            enabled: true
+            enabled: true,
         },
         android: {
             required: [
@@ -96,7 +96,11 @@ cc_binary {
                 "libext2_com_err",
                 "libext2_e2p",
             ],
-            symlinks: ["mkfs.ext2", "mkfs.ext3", "mkfs.ext4"],
+            symlinks: [
+                "mkfs.ext2",
+                "mkfs.ext3",
+                "mkfs.ext4",
+            ],
         },
     },
 }
-- 
1.8.3.1