bpfmt all the .bp files to silence ayeaye.
Test: treehugger
Change-Id: I5b7add6f013dcd2d4eee4851b7a2a22310c6d533
diff --git a/libc/Android.bp b/libc/Android.bp
index 02e3e11..61ef29d 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -93,7 +93,7 @@
header_libs: [
"libc_headers",
- "liblog_headers", // needed by bionic/libc/async_safe/include
+ "liblog_headers", // needed by bionic/libc/async_safe/include
],
export_header_lib_headers: [
"libc_headers",
@@ -215,7 +215,10 @@
},
defaults: ["libc_defaults"],
- cflags: ["-fno-stack-protector", "-ffreestanding"],
+ cflags: [
+ "-fno-stack-protector",
+ "-ffreestanding",
+ ],
name: "libc_bootstrap",
}
@@ -808,8 +811,8 @@
},
riscv64: {
srcs: [
- "arch-riscv64/string/__memset_chk.S",
- "arch-riscv64/string/__memcpy_chk.S",
+ "arch-riscv64/string/__memset_chk.S",
+ "arch-riscv64/string/__memcpy_chk.S",
],
},
},
@@ -1553,7 +1556,7 @@
srcs: ["arch-arm64/static_function_dispatch.S"],
},
riscv64: {
- srcs: ["arch-riscv64/static_function_dispatch.S"]
+ srcs: ["arch-riscv64/static_function_dispatch.S"],
},
},
}
@@ -1584,7 +1587,7 @@
srcs: ["arch-arm64/dynamic_function_dispatch.cpp"],
},
riscv64: {
- srcs: ["arch-riscv64/dynamic_function_dispatch.cpp"]
+ srcs: ["arch-riscv64/dynamic_function_dispatch.cpp"],
},
},
}
@@ -1703,7 +1706,7 @@
},
},
static: {
- srcs: [ ":libc_sources_static" ],
+ srcs: [":libc_sources_static"],
cflags: ["-DLIBC_STATIC"],
whole_static_libs: [
"gwp_asan",
@@ -1714,7 +1717,7 @@
],
},
shared: {
- srcs: [ ":libc_sources_shared" ],
+ srcs: [":libc_sources_shared"],
whole_static_libs: [
"gwp_asan",
"gwp_asan_crash_handler",
@@ -1844,7 +1847,7 @@
cc_library {
name: "libc",
- defaults: [
+ defaults: [
"libc_library_defaults",
],
stubs: {
@@ -1866,7 +1869,7 @@
cc_library {
name: "libc_hwasan",
- defaults: [
+ defaults: [
"libc_library_defaults",
],
sanitize: {
@@ -2257,7 +2260,7 @@
name: "crtend_so",
local_include_dirs: [
"include",
- "private", // crtend_so.S depends on private/bionic_asm_arm64.h
+ "private", // crtend_so.S depends on private/bionic_asm_arm64.h
],
srcs: ["arch-common/bionic/crtend_so.S"],
@@ -2272,7 +2275,7 @@
"bionic", // crtbegin.c includes bionic/libc_init_common.h
],
- cflags: [ "-DCRTBEGIN_STATIC", ],
+ cflags: ["-DCRTBEGIN_STATIC"],
srcs: ["arch-common/bionic/crtbegin.c"],
objs: [
@@ -2311,7 +2314,7 @@
name: "crtend_android",
local_include_dirs: [
"include",
- "private", // crtend.S depends on private/bionic_asm_arm64.h
+ "private", // crtend.S depends on private/bionic_asm_arm64.h
],
srcs: ["arch-common/bionic/crtend.S"],
@@ -2322,7 +2325,7 @@
name: "crt_pad_segment",
local_include_dirs: [
"include",
- "private", // crt_pad_segment.S depends on private/bionic_asm_note.h
+ "private", // crt_pad_segment.S depends on private/bionic_asm_note.h
],
srcs: ["arch-common/bionic/crt_pad_segment.S"],
@@ -2332,9 +2335,9 @@
cc_library_static {
name: "note_memtag_heap_async",
arch: {
- arm64: {
- srcs: ["arch-arm64/bionic/note_memtag_heap_async.S"],
- }
+ arm64: {
+ srcs: ["arch-arm64/bionic/note_memtag_heap_async.S"],
+ },
},
sdk_version: "minimum",
@@ -2344,9 +2347,9 @@
cc_library_static {
name: "note_memtag_heap_sync",
arch: {
- arm64: {
- srcs: ["arch-arm64/bionic/note_memtag_heap_sync.S"],
- }
+ arm64: {
+ srcs: ["arch-arm64/bionic/note_memtag_heap_sync.S"],
+ },
},
sdk_version: "minimum",
@@ -2384,7 +2387,7 @@
},
riscv64: {
srcs: [
- "arch-riscv64/string/__memcpy_chk.S",
+ "arch-riscv64/string/__memcpy_chk.S",
],
},
},
@@ -2588,13 +2591,12 @@
srcs: ["kernel/uapi/**/*.h"],
}
-
cc_genrule {
name: "func_to_syscall_nrs",
recovery_available: true,
cmd: "$(location genfunctosyscallnrs) --out-dir=$(genDir) $(in)",
- tools: [ "genfunctosyscallnrs" ],
+ tools: ["genfunctosyscallnrs"],
srcs: [
"SYSCALLS.TXT",
@@ -2682,7 +2684,7 @@
name: "libseccomp_policy_app_zygote_sources_x86",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_zygote",
":libseccomp_gen_syscall_nrs_x86",
@@ -2694,8 +2696,12 @@
],
enabled: false,
arch: {
- x86: { enabled: true },
- x86_64: { enabled: true },
+ x86: {
+ enabled: true,
+ },
+ x86_64: {
+ enabled: true,
+ },
},
}
@@ -2703,7 +2709,7 @@
name: "libseccomp_policy_app_zygote_sources_arm",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_zygote",
":libseccomp_gen_syscall_nrs_arm",
@@ -2715,8 +2721,12 @@
],
enabled: false,
arch: {
- arm: { enabled: true },
- arm64: { enabled: true },
+ arm: {
+ enabled: true,
+ },
+ arm64: {
+ enabled: true,
+ },
},
}
@@ -2724,7 +2734,7 @@
name: "libseccomp_policy_app_zygote_sources_riscv64",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_zygote",
":libseccomp_gen_syscall_nrs_riscv64",
@@ -2734,7 +2744,9 @@
],
enabled: false,
arch: {
- riscv64: { enabled: true },
+ riscv64: {
+ enabled: true,
+ },
},
}
@@ -2742,7 +2754,7 @@
name: "libseccomp_policy_app_sources_x86",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_app",
":libseccomp_gen_syscall_nrs_x86",
@@ -2754,8 +2766,12 @@
],
enabled: false,
arch: {
- x86: { enabled: true },
- x86_64: { enabled: true },
+ x86: {
+ enabled: true,
+ },
+ x86_64: {
+ enabled: true,
+ },
},
}
@@ -2763,7 +2779,7 @@
name: "libseccomp_policy_app_sources_arm",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_app",
":libseccomp_gen_syscall_nrs_arm",
@@ -2775,8 +2791,12 @@
],
enabled: false,
arch: {
- arm: { enabled: true },
- arm64: { enabled: true },
+ arm: {
+ enabled: true,
+ },
+ arm64: {
+ enabled: true,
+ },
},
}
@@ -2784,7 +2804,7 @@
name: "libseccomp_policy_app_sources_riscv64",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_app",
":libseccomp_gen_syscall_nrs_riscv64",
@@ -2794,7 +2814,9 @@
],
enabled: false,
arch: {
- riscv64: { enabled: true },
+ riscv64: {
+ enabled: true,
+ },
},
}
@@ -2802,7 +2824,7 @@
name: "libseccomp_policy_system_sources_x86",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_system",
":libseccomp_gen_syscall_nrs_x86",
@@ -2814,8 +2836,12 @@
],
enabled: false,
arch: {
- x86: { enabled: true },
- x86_64: { enabled: true },
+ x86: {
+ enabled: true,
+ },
+ x86_64: {
+ enabled: true,
+ },
},
}
@@ -2823,7 +2849,7 @@
name: "libseccomp_policy_system_sources_arm",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_system",
":libseccomp_gen_syscall_nrs_arm",
@@ -2835,8 +2861,12 @@
],
enabled: false,
arch: {
- arm: { enabled: true },
- arm64: { enabled: true },
+ arm: {
+ enabled: true,
+ },
+ arm64: {
+ enabled: true,
+ },
},
}
@@ -2844,7 +2874,7 @@
name: "libseccomp_policy_system_sources_riscv64",
recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)",
- tools: [ "genseccomp" ],
+ tools: ["genseccomp"],
srcs: [
":seccomp_syscalls_sources_system",
":libseccomp_gen_syscall_nrs_riscv64",
@@ -2854,7 +2884,9 @@
],
enabled: false,
arch: {
- riscv64: { enabled: true },
+ riscv64: {
+ enabled: true,
+ },
},
}
@@ -2866,37 +2898,37 @@
arch: {
arm: {
generated_sources: [
- "libseccomp_policy_app_sources_arm",
- "libseccomp_policy_app_zygote_sources_arm",
- "libseccomp_policy_system_sources_arm",
+ "libseccomp_policy_app_sources_arm",
+ "libseccomp_policy_app_zygote_sources_arm",
+ "libseccomp_policy_system_sources_arm",
],
},
arm64: {
generated_sources: [
- "libseccomp_policy_app_sources_arm",
- "libseccomp_policy_app_zygote_sources_arm",
- "libseccomp_policy_system_sources_arm",
+ "libseccomp_policy_app_sources_arm",
+ "libseccomp_policy_app_zygote_sources_arm",
+ "libseccomp_policy_system_sources_arm",
],
},
riscv64: {
generated_sources: [
- "libseccomp_policy_app_sources_riscv64",
- "libseccomp_policy_app_zygote_sources_riscv64",
- "libseccomp_policy_system_sources_riscv64",
+ "libseccomp_policy_app_sources_riscv64",
+ "libseccomp_policy_app_zygote_sources_riscv64",
+ "libseccomp_policy_system_sources_riscv64",
],
},
x86: {
generated_sources: [
- "libseccomp_policy_app_sources_x86",
- "libseccomp_policy_app_zygote_sources_x86",
- "libseccomp_policy_system_sources_x86",
+ "libseccomp_policy_app_sources_x86",
+ "libseccomp_policy_app_zygote_sources_x86",
+ "libseccomp_policy_system_sources_x86",
],
},
x86_64: {
generated_sources: [
- "libseccomp_policy_app_sources_x86",
- "libseccomp_policy_app_zygote_sources_x86",
- "libseccomp_policy_system_sources_x86",
+ "libseccomp_policy_app_sources_x86",
+ "libseccomp_policy_app_zygote_sources_x86",
+ "libseccomp_policy_system_sources_x86",
],
},
},
@@ -3124,6 +3156,6 @@
// headers that will be placed on the include path when running versioner in bazel
// this module should be a no-op in soong
filegroup {
- name: "versioner-dependencies",
- srcs: ["versioner-dependencies/**/*"],
+ name: "versioner-dependencies",
+ srcs: ["versioner-dependencies/**/*"],
}
diff --git a/libc/async_safe/Android.bp b/libc/async_safe/Android.bp
index eb690dd..c7de2ce 100644
--- a/libc/async_safe/Android.bp
+++ b/libc/async_safe/Android.bp
@@ -23,7 +23,10 @@
native_bridge_supported: true,
include_dirs: ["bionic/libc"],
- header_libs: ["libc_headers", "liblog_headers"],
+ header_libs: [
+ "libc_headers",
+ "liblog_headers",
+ ],
export_include_dirs: ["include"],
export_header_lib_headers: ["liblog_headers"],
diff --git a/libc/malloc_hooks/Android.bp b/libc/malloc_hooks/Android.bp
index 6b4e606..f5b3848 100644
--- a/libc/malloc_hooks/Android.bp
+++ b/libc/malloc_hooks/Android.bp
@@ -75,7 +75,7 @@
local_include_dirs: ["tests"],
include_dirs: [
"bionic/libc",
- "bionic"
+ "bionic",
],
header_libs: [
"bionic_libc_platform_headers",
@@ -84,7 +84,7 @@
cflags: [
"-Wall",
"-Werror",
- "-O1", // FIXME: http://b/169206016 - issues with aligned_alloc and -O2
+ "-O1", // FIXME: http://b/169206016 - issues with aligned_alloc and -O2
],
test_suites: ["general-tests"],
}