aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.bp1
-rw-r--r--benchmarks/Android.bp7
-rw-r--r--libc/Android.bp21
-rw-r--r--libc/malloc_debug/Android.bp10
-rw-r--r--libc/seccomp/Android.bp5
-rw-r--r--libdl/Android.bp9
-rw-r--r--linker/Android.bp19
-rw-r--r--tests/Android.bp28
-rw-r--r--tests/headers/posix/Android.bp10
-rw-r--r--tests/libs/Android.bp8
10 files changed, 81 insertions, 37 deletions
diff --git a/Android.bp b/Android.bp
index dbe5c97e7..b44c29601 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,2 +1 @@
subdirs = ["*"]
-
diff --git a/benchmarks/Android.bp b/benchmarks/Android.bp
index 115236bf6..f6d0e4dac 100644
--- a/benchmarks/Android.bp
+++ b/benchmarks/Android.bp
@@ -67,7 +67,7 @@ cc_benchmark {
"libsystemproperties",
"libasync_safe",
],
- include_dirs: ["bionic/libc",],
+ include_dirs: ["bionic/libc"],
}
// We don't build a static benchmark executable because it's not usually
@@ -107,5 +107,8 @@ cc_test {
"libbase",
"libBionicBenchmarksUtils",
],
- data: ["suites/*", "test_suites/*"],
+ data: [
+ "suites/*",
+ "test_suites/*",
+ ],
}
diff --git a/libc/Android.bp b/libc/Android.bp
index 0f5820459..2508ff7db 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -709,7 +709,10 @@ cc_library_static {
// Disable FORTIFY for the compilation of these, so we don't end up having
// FORTIFY silently call itself.
- cflags: ["-U_FORTIFY_SOURCE", "-D__BIONIC_DECLARE_FORTIFY_HELPERS"],
+ cflags: [
+ "-U_FORTIFY_SOURCE",
+ "-D__BIONIC_DECLARE_FORTIFY_HELPERS",
+ ],
arch: {
arm: {
@@ -718,7 +721,10 @@ cc_library_static {
"arch-arm/generic/bionic/__memcpy_chk.S",
],
neon: {
- cflags: ["-DNO___STRCAT_CHK", "-DNO___STRCPY_CHK"],
+ cflags: [
+ "-DNO___STRCAT_CHK",
+ "-DNO___STRCPY_CHK",
+ ],
srcs: [
"arch-arm/cortex-a15/bionic/__strcat_chk.S",
"arch-arm/cortex-a15/bionic/__strcpy_chk.S",
@@ -1696,7 +1702,10 @@ cc_library {
"ld-android",
"libdl",
],
- whole_static_libs: ["libc_common", "libjemalloc"],
+ whole_static_libs: [
+ "libc_common",
+ "libjemalloc",
+ ],
nocrt: true,
@@ -1794,7 +1803,11 @@ cc_defaults {
defaults: ["linux_bionic_supported"],
vendor_available: true,
- cflags: ["-Wno-gcc-compat", "-Wall", "-Werror"],
+ cflags: [
+ "-Wno-gcc-compat",
+ "-Wall",
+ "-Werror",
+ ],
}
cc_defaults {
diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index 06fc426d6..ede24315f 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -13,7 +13,10 @@ cc_library_static {
stl: "libc++_static",
- whole_static_libs: ["libasync_safe", "libdemangle"],
+ whole_static_libs: [
+ "libasync_safe",
+ "libdemangle",
+ ],
include_dirs: ["bionic/libc"],
@@ -117,7 +120,10 @@ cc_test {
whole_static_libs: ["libc_malloc_debug"],
local_include_dirs: ["tests"],
- include_dirs: ["bionic/libc", "bionic/libc/async_safe/include"],
+ include_dirs: [
+ "bionic/libc",
+ "bionic/libc/async_safe/include",
+ ],
shared_libs: ["libbase"],
diff --git a/libc/seccomp/Android.bp b/libc/seccomp/Android.bp
index bb9184927..ae9985721 100644
--- a/libc/seccomp/Android.bp
+++ b/libc/seccomp/Android.bp
@@ -22,7 +22,10 @@ cc_library {
"mips64_system_policy.cpp",
],
export_include_dirs: ["include"],
- cflags: ["-Wall", "-Werror"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
shared: {
shared_libs: ["libbase"],
},
diff --git a/libdl/Android.bp b/libdl/Android.bp
index 0603d068f..082cdead1 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -4,7 +4,10 @@
cc_library_static {
name: "libdl_static",
- srcs: ["libdl.cpp", "libdl_cfi.cpp"],
+ srcs: [
+ "libdl.cpp",
+ "libdl_cfi.cpp",
+ ],
cflags: [
"-Wall",
@@ -71,7 +74,7 @@ cc_library {
whole_static_libs: ["libdl_static"],
},
static: {
- srcs: [ "libdl_static.c" ],
+ srcs: ["libdl_static.c"],
},
cflags: [
"-Wall",
@@ -91,7 +94,7 @@ cc_library {
// This is placeholder library the actual implementation is (currently)
// provided by the linker.
- shared_libs: [ "ld-android" ],
+ shared_libs: ["ld-android"],
sanitize: {
never: true,
diff --git a/linker/Android.bp b/linker/Android.bp
index 8d7fae562..50587f27e 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -6,7 +6,10 @@ cc_library_static {
"linker_allocator.cpp",
"linker_memory.cpp",
],
- cflags: ["-Wall", "-Werror"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
// We need to access Bionic private headers in the linker.
include_dirs: ["bionic/libc"],
@@ -26,9 +29,15 @@ cc_object {
host_supported: true,
device_supported: false,
target: {
- linux_bionic: { enabled: true },
- linux_glibc: { enabled: false },
- darwin: { enabled: false },
+ linux_bionic: {
+ enabled: true,
+ },
+ linux_glibc: {
+ enabled: false,
+ },
+ darwin: {
+ enabled: false,
+ },
},
cflags: [
@@ -187,7 +196,7 @@ cc_binary {
// Important: The liblinker_malloc should be the last library in the list
// to overwrite any other malloc implementations by other static libraries.
- "liblinker_malloc"
+ "liblinker_malloc",
],
static_executable: true,
diff --git a/tests/Android.bp b/tests/Android.bp
index 443fe8e62..56a4722ec 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -245,10 +245,13 @@ cc_test_library {
cc_test_library {
name: "libfortify1-tests-clang",
- defaults: ["bionic_fortify_tests_defaults", "bionic_tests_defaults"],
+ defaults: [
+ "bionic_fortify_tests_defaults",
+ "bionic_tests_defaults",
+ ],
cflags: [
"-D_FORTIFY_SOURCE=1",
- "-DTEST_NAME=Fortify1_clang"
+ "-DTEST_NAME=Fortify1_clang",
],
shared: {
enabled: false,
@@ -257,10 +260,13 @@ cc_test_library {
cc_test_library {
name: "libfortify2-tests-clang",
- defaults: ["bionic_fortify_tests_defaults", "bionic_tests_defaults"],
+ defaults: [
+ "bionic_fortify_tests_defaults",
+ "bionic_tests_defaults",
+ ],
cflags: [
"-D_FORTIFY_SOURCE=2",
- "-DTEST_NAME=Fortify2_clang"
+ "-DTEST_NAME=Fortify2_clang",
],
shared: {
enabled: false,
@@ -312,7 +318,10 @@ cc_test_library {
cc_test_library {
name: "libBionicLoaderTests",
- defaults: ["bionic_tests_defaults", "llvm-defaults"],
+ defaults: [
+ "bionic_tests_defaults",
+ "llvm-defaults",
+ ],
srcs: [
"atexit_test.cpp",
"dl_test.cpp",
@@ -347,7 +356,7 @@ cc_test_library {
"libLLVMCore",
"libLLVMSupport",
],
- }
+ },
},
}
@@ -439,12 +448,15 @@ cc_defaults {
"-Wl,--enable-new-dtags",
],
},
- }
+ },
}
cc_test {
name: "bionic-unit-tests",
- defaults: ["bionic_unit_tests_defaults", "bionic_tests_defaults"],
+ defaults: [
+ "bionic_unit_tests_defaults",
+ "bionic_tests_defaults",
+ ],
target: {
android: {
diff --git a/tests/headers/posix/Android.bp b/tests/headers/posix/Android.bp
index 682627fb0..8f3a2f29b 100644
--- a/tests/headers/posix/Android.bp
+++ b/tests/headers/posix/Android.bp
@@ -18,11 +18,11 @@ cc_library_static {
name: "libbionic_tests_headers_posix",
srcs: ["*.c"],
cflags: [
- "-Wno-absolute-value", // broken clang diagnostic that doesn't understand <tgmath.h>
- "-Wno-deprecated",
- "-Werror",
- "-D_POSIX_C_SOURCE=200809L",
- "-D_XOPEN_SOURCE=700",
+ "-Wno-absolute-value", // broken clang diagnostic that doesn't understand <tgmath.h>
+ "-Wno-deprecated",
+ "-Werror",
+ "-D_POSIX_C_SOURCE=200809L",
+ "-D_XOPEN_SOURCE=700",
],
host_supported: true,
target: {
diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index cae30b5f5..3afda6709 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -80,7 +80,7 @@ cc_test_library {
defaults: ["bionic_testlib_defaults"],
srcs: ["dlext_test_library.cpp"],
ldflags: ["-Wl,-z,norelro"],
- shared_libs = ["libtest_simple"],
+ shared_libs: ["libtest_simple"],
}
// -----------------------------------------------------------------------------
@@ -123,7 +123,6 @@ cc_test_library {
relative_install_path: "bionic-loader-test-libs/public_namespace_libs",
}
-
// -----------------------------------------------------------------------------
// Library used by dlext indirect unload on the namespace boundary tests
//
@@ -407,7 +406,6 @@ cc_test_library {
// +-> libtest_relo_check_dt_needed_order_2.so
// -----------------------------------------------------------------------------
-
cc_test_library {
name: "libtest_relo_check_dt_needed_order",
defaults: ["bionic_testlib_defaults"],
@@ -457,7 +455,7 @@ cc_test_library {
name: "libtest_ifunc_variable",
defaults: ["bionic_testlib_defaults"],
srcs: ["dlopen_testlib_ifunc_variable.cpp"],
- shared_libs: [ "libtest_ifunc_variable_impl" ],
+ shared_libs: ["libtest_ifunc_variable_impl"],
arch: {
mips: {
@@ -560,7 +558,6 @@ cc_test_library {
},
}
-
// -----------------------------------------------------------------------------
// Library with weak function
// -----------------------------------------------------------------------------
@@ -696,7 +693,6 @@ cc_test_library {
srcs: ["thread_local_dtor.cpp"],
}
-
// -----------------------------------------------------------------------------
// Tool to use to align the shared libraries in a zip file.
// -----------------------------------------------------------------------------
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 09:49:46 +0000