diff options
author | Eric Biggers <ebiggers@google.com> | 2023-01-30 19:04:33 +0000 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2023-02-01 00:28:40 -0500 |
commit | cdc9dbf348a99b94a9f750ffdb7e6191d8ac0f39 (patch) | |
tree | 33db0c8d1fbe957eb2339de33773d46b6b32b174 | |
parent | 9aaccbc6fded1b3cfb7c9521665b8b7162f2150f (diff) | |
download | e2fsprogs-cdc9dbf348a99b94a9f750ffdb7e6191d8ac0f39.tar.gz |
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
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | debugfs/Android.bp | 2 | ||||
-rw-r--r-- | lib/Android.bp | 1 | ||||
-rw-r--r-- | lib/support/Android.bp | 2 | ||||
-rw-r--r-- | lib/uuid/Android.bp | 2 | ||||
-rw-r--r-- | misc/Android.bp | 8 |
6 files changed, 13 insertions, 7 deletions
@@ -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 4c60a2dc..4d087b34 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 fb0ea07e..529fa238 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 c54ca5fc..af9b28df 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 f8f07603..3e6048d0 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 083ae689..0656bf48 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", + ], }, }, } |