tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bpfmt all the .bp files to silence ayeaye.

Browse source 
Test: treehugger
Change-Id: I5b7add6f013dcd2d4eee4851b7a2a22310c6d533
This commit is contained in:
Elliott Hughes 2024-01-19 19:05:36 +00:00
parent 569b45dce5
commit 1eacc0edc0
9 changed files with 276 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apex/Android.bp
View file

@ -43,7 +43,10 @@ apex {
],
arch: {
arm64: {
native_shared_libs: ["libc_hwasan", "libclang_rt.hwasan"],
native_shared_libs: [
"libc_hwasan",
"libclang_rt.hwasan",
],
},
},
binaries: [

8
benchmarks/linker_relocation/Android.bp
View file

@ -68,8 +68,12 @@ cc_defaults {
compile_multilib: "both",
multilib: {
lib32: { suffix: "32" },
lib64: { suffix: "64" },
lib32: {
suffix: "32",
},
lib64: {
suffix: "64",
},
},
}

100
libc/Android.bp
View file

@ -215,7 +215,10 @@ cc_library_static {
},
defaults: ["libc_defaults"],
cflags: ["-fno-stack-protector", "-ffreestanding"],
cflags: [
"-fno-stack-protector",
"-ffreestanding",
],
name: "libc_bootstrap",
}
@ -1553,7 +1556,7 @@ cc_library_static {
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 @@ cc_library_static {
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 @@ cc_defaults {
},
},
static: {
srcs: [ ":libc_sources_static" ],
srcs: [":libc_sources_static"],
cflags: ["-DLIBC_STATIC"],
whole_static_libs: [
"gwp_asan",
@ -1714,7 +1717,7 @@ cc_defaults {
],
},
shared: {
srcs: [ ":libc_sources_shared" ],
srcs: [":libc_sources_shared"],
whole_static_libs: [
"gwp_asan",
"gwp_asan_crash_handler",
@ -2272,7 +2275,7 @@ cc_object {
"bionic", // crtbegin.c includes bionic/libc_init_common.h
],
cflags: [ "-DCRTBEGIN_STATIC", ],
cflags: ["-DCRTBEGIN_STATIC"],
srcs: ["arch-common/bionic/crtbegin.c"],
objs: [
@ -2334,7 +2337,7 @@ cc_library_static {
arch: {
arm64: {
srcs: ["arch-arm64/bionic/note_memtag_heap_async.S"],
}
},
},
sdk_version: "minimum",
@ -2346,7 +2349,7 @@ cc_library_static {
arch: {
arm64: {
srcs: ["arch-arm64/bionic/note_memtag_heap_sync.S"],
}
},
},
sdk_version: "minimum",
@ -2588,13 +2591,12 @@ filegroup {
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 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
x86: { enabled: true },
x86_64: { enabled: true },
x86: {
enabled: true,
},
x86_64: {
enabled: true,
},
},
}
@ -2703,7 +2709,7 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
arm: { enabled: true },
arm64: { enabled: true },
arm: {
enabled: true,
},
arm64: {
enabled: true,
},
},
}
@ -2724,7 +2734,7 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
riscv64: { enabled: true },
riscv64: {
enabled: true,
},
},
}
@ -2742,7 +2754,7 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
x86: { enabled: true },
x86_64: { enabled: true },
x86: {
enabled: true,
},
x86_64: {
enabled: true,
},
},
}
@ -2763,7 +2779,7 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
arm: { enabled: true },
arm64: { enabled: true },
arm: {
enabled: true,
},
arm64: {
enabled: true,
},
},
}
@ -2784,7 +2804,7 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
riscv64: { enabled: true },
riscv64: {
enabled: true,
},
},
}
@ -2802,7 +2824,7 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
x86: { enabled: true },
x86_64: { enabled: true },
x86: {
enabled: true,
},
x86_64: {
enabled: true,
},
},
}
@ -2823,7 +2849,7 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
arm: { enabled: true },
arm64: { enabled: true },
arm: {
enabled: true,
},
arm64: {
enabled: true,
},
},
}
@ -2844,7 +2874,7 @@ cc_genrule {
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 @@ cc_genrule {
],
enabled: false,
arch: {
riscv64: { enabled: true },
riscv64: {
enabled: true,
},
},
}

5
libc/async_safe/Android.bp
View file

@ -23,7 +23,10 @@ cc_library_static {
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"],

2
libc/malloc_hooks/Android.bp
View file

@ -75,7 +75,7 @@ cc_test {
local_include_dirs: ["tests"],
include_dirs: [
"bionic/libc",
"bionic"
"bionic",
],
header_libs: [
"bionic_libc_platform_headers",

2
libdl/Android.bp
View file

@ -193,7 +193,7 @@ cc_library {
},
},
srcs: [ "libdl_android.cpp" ],
srcs: ["libdl_android.cpp"],
version_script: "libdl_android.map.txt",
cflags: [

40
linker/Android.bp
View file

@ -141,7 +141,10 @@ cc_defaults {
cc_library_static {
name: "liblinker_main",
defaults: ["linker_defaults", "linker_all_targets"],
defaults: [
"linker_defaults",
"linker_all_targets",
],
srcs: ["linker_main.cpp"],
// Ensure that the compiler won't insert string function calls before ifuncs are resolved.
@ -153,7 +156,10 @@ cc_library_static {
cc_library_static {
name: "liblinker_malloc",
defaults: ["linker_defaults", "linker_all_targets"],
defaults: [
"linker_defaults",
"linker_all_targets",
],
srcs: ["linker_memory.cpp"],
apex_available: [
"com.android.runtime",
@ -162,7 +168,10 @@ cc_library_static {
cc_library_static {
name: "liblinker_debuggerd_stub",
defaults: ["linker_defaults", "linker_all_targets"],
defaults: [
"linker_defaults",
"linker_all_targets",
],
srcs: ["linker_debuggerd_stub.cpp"],
}
@ -241,11 +250,21 @@ filegroup {
cc_defaults {
name: "linker_version_script_overlay",
arch: {
arm: { version_script: "linker.arm.map" },
arm64: { version_script: "linker.generic.map" },
riscv64: { version_script: "linker.generic.map" },
x86: { version_script: "linker.generic.map" },
x86_64: { version_script: "linker.generic.map" },
arm: {
version_script: "linker.arm.map",
},
arm64: {
version_script: "linker.generic.map",
},
riscv64: {
version_script: "linker.generic.map",
},
x86: {
version_script: "linker.generic.map",
},
x86_64: {
version_script: "linker.generic.map",
},
},
}
@ -483,7 +502,10 @@ cc_library {
stl: "none",
name: "ld-android",
defaults: ["linux_bionic_supported", "linker_version_script_overlay"],
defaults: [
"linux_bionic_supported",
"linker_version_script_overlay",
],
ramdisk_available: true,
vendor_ramdisk_available: true,
recovery_available: true,

7
tests/Android.bp
View file

@ -67,7 +67,7 @@ cc_defaults {
],
header_libs: [
"libcutils_headers",
"gwp_asan_headers"
"gwp_asan_headers",
],
stl: "libc++",
@ -1101,7 +1101,10 @@ cc_test {
shared_libs: [
"libbase",
],
data_libs: ["libtest_simple_hwasan", "libtest_simple_hwasan_nohwasan"],
data_libs: [
"libtest_simple_hwasan",
"libtest_simple_hwasan_nohwasan",
],
header_libs: ["bionic_libc_platform_headers"],
test_suites: ["device-tests"],
}

44
tests/libs/Android.bp
View file

@ -95,7 +95,6 @@ cc_test {
shared_libs: ["libtest_elftls_shared_var"],
}
cc_test_library {
name: "libtest_elftls_dynamic_filler_1",
defaults: ["bionic_testlib_defaults"],
@ -1492,7 +1491,7 @@ cc_test_library {
shared_libs: ["ld_config_test_helper_lib2"],
relative_install_path: "bionic-loader-test-libs/ns2",
// Mark the library DF_1_GLOBAL so it is added to every linker namespace.
ldflags: ["-Wl,-z,global"]
ldflags: ["-Wl,-z,global"],
}
cc_test_library {
@ -1541,7 +1540,6 @@ cc_test_library {
srcs: ["segment_gap_inner.cpp"],
}
// -----------------------------------------------------------------------------
// Check that we support all kinds of relocations: regular, "relocation packer",
// and both the old and new SHT_RELR constants.
@ -1604,7 +1602,10 @@ cc_defaults {
cc_test {
name: "heap_tagging_sync_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"],
defaults: [
"bionic_testlib_defaults",
"bionic_targets_only",
],
srcs: ["heap_tagging_helper.cpp"],
sanitize: {
memtag_heap: true,
@ -1617,7 +1618,10 @@ cc_test {
cc_test {
name: "heap_tagging_async_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"],
defaults: [
"bionic_testlib_defaults",
"bionic_targets_only",
],
srcs: ["heap_tagging_helper.cpp"],
sanitize: {
memtag_heap: true,
@ -1630,7 +1634,10 @@ cc_test {
cc_test {
name: "heap_tagging_disabled_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"],
defaults: [
"bionic_testlib_defaults",
"bionic_targets_only",
],
srcs: ["heap_tagging_helper.cpp"],
sanitize: {
memtag_heap: false,
@ -1640,7 +1647,10 @@ cc_test {
cc_test {
name: "heap_tagging_static_sync_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"],
defaults: [
"bionic_testlib_defaults",
"bionic_targets_only",
],
srcs: ["heap_tagging_helper.cpp"],
static_executable: true,
sanitize: {
@ -1654,7 +1664,10 @@ cc_test {
cc_test {
name: "heap_tagging_static_async_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"],
defaults: [
"bionic_testlib_defaults",
"bionic_targets_only",
],
srcs: ["heap_tagging_helper.cpp"],
static_executable: true,
sanitize: {
@ -1668,7 +1681,10 @@ cc_test {
cc_test {
name: "heap_tagging_static_disabled_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"],
defaults: [
"bionic_testlib_defaults",
"bionic_targets_only",
],
srcs: ["heap_tagging_helper.cpp"],
static_executable: true,
sanitize: {
@ -1679,7 +1695,10 @@ cc_test {
cc_test {
name: "stack_tagging_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"],
defaults: [
"bionic_testlib_defaults",
"bionic_targets_only",
],
srcs: ["stack_tagging_helper.cpp"],
sanitize: {
memtag_heap: true,
@ -1695,7 +1714,10 @@ cc_test {
cc_test {
name: "stack_tagging_static_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"],
defaults: [
"bionic_testlib_defaults",
"bionic_targets_only",
],
srcs: ["stack_tagging_helper.cpp"],
static_executable: true,
sanitize: {