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: { arch: {
arm64: { arm64: {
native_shared_libs: ["libc_hwasan", "libclang_rt.hwasan"], native_shared_libs: [
"libc_hwasan",
"libclang_rt.hwasan",
],
}, },
}, },
binaries: [ binaries: [

8
benchmarks/linker_relocation/Android.bp
View file

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

160
libc/Android.bp
View file

@ -93,7 +93,7 @@ cc_defaults {
header_libs: [ header_libs: [
"libc_headers", "libc_headers",
"liblog_headers", // needed by bionic/libc/async_safe/include "liblog_headers", // needed by bionic/libc/async_safe/include
], ],
export_header_lib_headers: [ export_header_lib_headers: [
"libc_headers", "libc_headers",
@ -215,7 +215,10 @@ cc_library_static {
}, },
defaults: ["libc_defaults"], defaults: ["libc_defaults"],
cflags: ["-fno-stack-protector", "-ffreestanding"], cflags: [
"-fno-stack-protector",
"-ffreestanding",
],
name: "libc_bootstrap", name: "libc_bootstrap",
} }
@ -808,8 +811,8 @@ cc_library_static {
}, },
riscv64: { riscv64: {
srcs: [ srcs: [
"arch-riscv64/string/__memset_chk.S", "arch-riscv64/string/__memset_chk.S",
"arch-riscv64/string/__memcpy_chk.S", "arch-riscv64/string/__memcpy_chk.S",
], ],
}, },
}, },
@ -1553,7 +1556,7 @@ cc_library_static {
srcs: ["arch-arm64/static_function_dispatch.S"], srcs: ["arch-arm64/static_function_dispatch.S"],
}, },
riscv64: { 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"], srcs: ["arch-arm64/dynamic_function_dispatch.cpp"],
}, },
riscv64: { riscv64: {
srcs: ["arch-riscv64/dynamic_function_dispatch.cpp"] srcs: ["arch-riscv64/dynamic_function_dispatch.cpp"],
}, },
}, },
} }
@ -1703,7 +1706,7 @@ cc_defaults {
}, },
}, },
static: { static: {
srcs: [ ":libc_sources_static" ], srcs: [":libc_sources_static"],
cflags: ["-DLIBC_STATIC"], cflags: ["-DLIBC_STATIC"],
whole_static_libs: [ whole_static_libs: [
"gwp_asan", "gwp_asan",
@ -1714,7 +1717,7 @@ cc_defaults {
], ],
}, },
shared: { shared: {
srcs: [ ":libc_sources_shared" ], srcs: [":libc_sources_shared"],
whole_static_libs: [ whole_static_libs: [
"gwp_asan", "gwp_asan",
"gwp_asan_crash_handler", "gwp_asan_crash_handler",
@ -1844,7 +1847,7 @@ cc_defaults {
cc_library { cc_library {
name: "libc", name: "libc",
defaults: [ defaults: [
"libc_library_defaults", "libc_library_defaults",
], ],
stubs: { stubs: {
@ -1866,7 +1869,7 @@ cc_library {
cc_library { cc_library {
name: "libc_hwasan", name: "libc_hwasan",
defaults: [ defaults: [
"libc_library_defaults", "libc_library_defaults",
], ],
sanitize: { sanitize: {
@ -2257,7 +2260,7 @@ cc_object {
name: "crtend_so", name: "crtend_so",
local_include_dirs: [ local_include_dirs: [
"include", "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"], srcs: ["arch-common/bionic/crtend_so.S"],
@ -2272,7 +2275,7 @@ cc_object {
"bionic", // crtbegin.c includes bionic/libc_init_common.h "bionic", // crtbegin.c includes bionic/libc_init_common.h
], ],
cflags: [ "-DCRTBEGIN_STATIC", ], cflags: ["-DCRTBEGIN_STATIC"],
srcs: ["arch-common/bionic/crtbegin.c"], srcs: ["arch-common/bionic/crtbegin.c"],
objs: [ objs: [
@ -2311,7 +2314,7 @@ cc_object {
name: "crtend_android", name: "crtend_android",
local_include_dirs: [ local_include_dirs: [
"include", "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"], srcs: ["arch-common/bionic/crtend.S"],
@ -2322,7 +2325,7 @@ cc_object {
name: "crt_pad_segment", name: "crt_pad_segment",
local_include_dirs: [ local_include_dirs: [
"include", "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"], srcs: ["arch-common/bionic/crt_pad_segment.S"],
@ -2332,9 +2335,9 @@ cc_object {
cc_library_static { cc_library_static {
name: "note_memtag_heap_async", name: "note_memtag_heap_async",
arch: { arch: {
arm64: { arm64: {
srcs: ["arch-arm64/bionic/note_memtag_heap_async.S"], srcs: ["arch-arm64/bionic/note_memtag_heap_async.S"],
} },
}, },
sdk_version: "minimum", sdk_version: "minimum",
@ -2344,9 +2347,9 @@ cc_library_static {
cc_library_static { cc_library_static {
name: "note_memtag_heap_sync", name: "note_memtag_heap_sync",
arch: { arch: {
arm64: { arm64: {
srcs: ["arch-arm64/bionic/note_memtag_heap_sync.S"], srcs: ["arch-arm64/bionic/note_memtag_heap_sync.S"],
} },
}, },
sdk_version: "minimum", sdk_version: "minimum",
@ -2384,7 +2387,7 @@ cc_library_static {
}, },
riscv64: { riscv64: {
srcs: [ srcs: [
"arch-riscv64/string/__memcpy_chk.S", "arch-riscv64/string/__memcpy_chk.S",
], ],
}, },
}, },
@ -2588,13 +2591,12 @@ filegroup {
srcs: ["kernel/uapi/**/*.h"], srcs: ["kernel/uapi/**/*.h"],
} }
cc_genrule { cc_genrule {
name: "func_to_syscall_nrs", name: "func_to_syscall_nrs",
recovery_available: true, recovery_available: true,
cmd: "$(location genfunctosyscallnrs) --out-dir=$(genDir) $(in)", cmd: "$(location genfunctosyscallnrs) --out-dir=$(genDir) $(in)",
tools: [ "genfunctosyscallnrs" ], tools: ["genfunctosyscallnrs"],
srcs: [ srcs: [
"SYSCALLS.TXT", "SYSCALLS.TXT",
@ -2682,7 +2684,7 @@ cc_genrule {
name: "libseccomp_policy_app_zygote_sources_x86", name: "libseccomp_policy_app_zygote_sources_x86",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_zygote", ":seccomp_syscalls_sources_zygote",
":libseccomp_gen_syscall_nrs_x86", ":libseccomp_gen_syscall_nrs_x86",
@ -2694,8 +2696,12 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
x86: { enabled: true }, x86: {
x86_64: { enabled: true }, enabled: true,
},
x86_64: {
enabled: true,
},
}, },
} }
@ -2703,7 +2709,7 @@ cc_genrule {
name: "libseccomp_policy_app_zygote_sources_arm", name: "libseccomp_policy_app_zygote_sources_arm",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_zygote", ":seccomp_syscalls_sources_zygote",
":libseccomp_gen_syscall_nrs_arm", ":libseccomp_gen_syscall_nrs_arm",
@ -2715,8 +2721,12 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
arm: { enabled: true }, arm: {
arm64: { enabled: true }, enabled: true,
},
arm64: {
enabled: true,
},
}, },
} }
@ -2724,7 +2734,7 @@ cc_genrule {
name: "libseccomp_policy_app_zygote_sources_riscv64", name: "libseccomp_policy_app_zygote_sources_riscv64",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app_zygote $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_zygote", ":seccomp_syscalls_sources_zygote",
":libseccomp_gen_syscall_nrs_riscv64", ":libseccomp_gen_syscall_nrs_riscv64",
@ -2734,7 +2744,9 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
riscv64: { enabled: true }, riscv64: {
enabled: true,
},
}, },
} }
@ -2742,7 +2754,7 @@ cc_genrule {
name: "libseccomp_policy_app_sources_x86", name: "libseccomp_policy_app_sources_x86",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_app", ":seccomp_syscalls_sources_app",
":libseccomp_gen_syscall_nrs_x86", ":libseccomp_gen_syscall_nrs_x86",
@ -2754,8 +2766,12 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
x86: { enabled: true }, x86: {
x86_64: { enabled: true }, enabled: true,
},
x86_64: {
enabled: true,
},
}, },
} }
@ -2763,7 +2779,7 @@ cc_genrule {
name: "libseccomp_policy_app_sources_arm", name: "libseccomp_policy_app_sources_arm",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_app", ":seccomp_syscalls_sources_app",
":libseccomp_gen_syscall_nrs_arm", ":libseccomp_gen_syscall_nrs_arm",
@ -2775,8 +2791,12 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
arm: { enabled: true }, arm: {
arm64: { enabled: true }, enabled: true,
},
arm64: {
enabled: true,
},
}, },
} }
@ -2784,7 +2804,7 @@ cc_genrule {
name: "libseccomp_policy_app_sources_riscv64", name: "libseccomp_policy_app_sources_riscv64",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=app $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_app", ":seccomp_syscalls_sources_app",
":libseccomp_gen_syscall_nrs_riscv64", ":libseccomp_gen_syscall_nrs_riscv64",
@ -2794,7 +2814,9 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
riscv64: { enabled: true }, riscv64: {
enabled: true,
},
}, },
} }
@ -2802,7 +2824,7 @@ cc_genrule {
name: "libseccomp_policy_system_sources_x86", name: "libseccomp_policy_system_sources_x86",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_system", ":seccomp_syscalls_sources_system",
":libseccomp_gen_syscall_nrs_x86", ":libseccomp_gen_syscall_nrs_x86",
@ -2814,8 +2836,12 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
x86: { enabled: true }, x86: {
x86_64: { enabled: true }, enabled: true,
},
x86_64: {
enabled: true,
},
}, },
} }
@ -2823,7 +2849,7 @@ cc_genrule {
name: "libseccomp_policy_system_sources_arm", name: "libseccomp_policy_system_sources_arm",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_system", ":seccomp_syscalls_sources_system",
":libseccomp_gen_syscall_nrs_arm", ":libseccomp_gen_syscall_nrs_arm",
@ -2835,8 +2861,12 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
arm: { enabled: true }, arm: {
arm64: { enabled: true }, enabled: true,
},
arm64: {
enabled: true,
},
}, },
} }
@ -2844,7 +2874,7 @@ cc_genrule {
name: "libseccomp_policy_system_sources_riscv64", name: "libseccomp_policy_system_sources_riscv64",
recovery_available: true, recovery_available: true,
cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)", cmd: "$(location genseccomp) --out-dir=$(genDir) --name-modifier=system $(in)",
tools: [ "genseccomp" ], tools: ["genseccomp"],
srcs: [ srcs: [
":seccomp_syscalls_sources_system", ":seccomp_syscalls_sources_system",
":libseccomp_gen_syscall_nrs_riscv64", ":libseccomp_gen_syscall_nrs_riscv64",
@ -2854,7 +2884,9 @@ cc_genrule {
], ],
enabled: false, enabled: false,
arch: { arch: {
riscv64: { enabled: true }, riscv64: {
enabled: true,
},
}, },
} }
@ -2866,37 +2898,37 @@ cc_library {
arch: { arch: {
arm: { arm: {
generated_sources: [ generated_sources: [
"libseccomp_policy_app_sources_arm", "libseccomp_policy_app_sources_arm",
"libseccomp_policy_app_zygote_sources_arm", "libseccomp_policy_app_zygote_sources_arm",
"libseccomp_policy_system_sources_arm", "libseccomp_policy_system_sources_arm",
], ],
}, },
arm64: { arm64: {
generated_sources: [ generated_sources: [
"libseccomp_policy_app_sources_arm", "libseccomp_policy_app_sources_arm",
"libseccomp_policy_app_zygote_sources_arm", "libseccomp_policy_app_zygote_sources_arm",
"libseccomp_policy_system_sources_arm", "libseccomp_policy_system_sources_arm",
], ],
}, },
riscv64: { riscv64: {
generated_sources: [ generated_sources: [
"libseccomp_policy_app_sources_riscv64", "libseccomp_policy_app_sources_riscv64",
"libseccomp_policy_app_zygote_sources_riscv64", "libseccomp_policy_app_zygote_sources_riscv64",
"libseccomp_policy_system_sources_riscv64", "libseccomp_policy_system_sources_riscv64",
], ],
}, },
x86: { x86: {
generated_sources: [ generated_sources: [
"libseccomp_policy_app_sources_x86", "libseccomp_policy_app_sources_x86",
"libseccomp_policy_app_zygote_sources_x86", "libseccomp_policy_app_zygote_sources_x86",
"libseccomp_policy_system_sources_x86", "libseccomp_policy_system_sources_x86",
], ],
}, },
x86_64: { x86_64: {
generated_sources: [ generated_sources: [
"libseccomp_policy_app_sources_x86", "libseccomp_policy_app_sources_x86",
"libseccomp_policy_app_zygote_sources_x86", "libseccomp_policy_app_zygote_sources_x86",
"libseccomp_policy_system_sources_x86", "libseccomp_policy_system_sources_x86",
], ],
}, },
}, },
@ -3124,6 +3156,6 @@ cc_genrule {
// headers that will be placed on the include path when running versioner in bazel // headers that will be placed on the include path when running versioner in bazel
// this module should be a no-op in soong // this module should be a no-op in soong
filegroup { filegroup {
name: "versioner-dependencies", name: "versioner-dependencies",
srcs: ["versioner-dependencies/**/*"], srcs: ["versioner-dependencies/**/*"],
} }

5
libc/async_safe/Android.bp
View file

@ -23,7 +23,10 @@ cc_library_static {
native_bridge_supported: true, native_bridge_supported: true,
include_dirs: ["bionic/libc"], include_dirs: ["bionic/libc"],
header_libs: ["libc_headers", "liblog_headers"], header_libs: [
"libc_headers",
"liblog_headers",
],
export_include_dirs: ["include"], export_include_dirs: ["include"],
export_header_lib_headers: ["liblog_headers"], export_header_lib_headers: ["liblog_headers"],

4
libc/malloc_hooks/Android.bp
View file

@ -75,7 +75,7 @@ cc_test {
local_include_dirs: ["tests"], local_include_dirs: ["tests"],
include_dirs: [ include_dirs: [
"bionic/libc", "bionic/libc",
"bionic" "bionic",
], ],
header_libs: [ header_libs: [
"bionic_libc_platform_headers", "bionic_libc_platform_headers",
@ -84,7 +84,7 @@ cc_test {
cflags: [ cflags: [
"-Wall", "-Wall",
"-Werror", "-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"], test_suites: ["general-tests"],
} }

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", version_script: "libdl_android.map.txt",
cflags: [ cflags: [

40
linker/Android.bp
View file

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

7
tests/Android.bp
View file

@ -67,7 +67,7 @@ cc_defaults {
], ],
header_libs: [ header_libs: [
"libcutils_headers", "libcutils_headers",
"gwp_asan_headers" "gwp_asan_headers",
], ],
stl: "libc++", stl: "libc++",
@ -1101,7 +1101,10 @@ cc_test {
shared_libs: [ shared_libs: [
"libbase", "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"], header_libs: ["bionic_libc_platform_headers"],
test_suites: ["device-tests"], test_suites: ["device-tests"],
} }

232
tests/libs/Android.bp
View file

@ -83,19 +83,18 @@ cc_test_library {
} }
cc_test { cc_test {
name: "thread_exit_cb_helper", name: "thread_exit_cb_helper",
defaults: ["bionic_testlib_defaults"], defaults: ["bionic_testlib_defaults"],
srcs: ["thread_exit_cb_helper.cpp"], srcs: ["thread_exit_cb_helper.cpp"],
} }
cc_test { cc_test {
name: "tls_properties_helper", name: "tls_properties_helper",
defaults: ["bionic_testlib_defaults"], defaults: ["bionic_testlib_defaults"],
srcs: ["tls_properties_helper.cpp"], srcs: ["tls_properties_helper.cpp"],
shared_libs: ["libtest_elftls_shared_var"], shared_libs: ["libtest_elftls_shared_var"],
} }
cc_test_library { cc_test_library {
name: "libtest_elftls_dynamic_filler_1", name: "libtest_elftls_dynamic_filler_1",
defaults: ["bionic_testlib_defaults"], defaults: ["bionic_testlib_defaults"],
@ -1492,7 +1491,7 @@ cc_test_library {
shared_libs: ["ld_config_test_helper_lib2"], shared_libs: ["ld_config_test_helper_lib2"],
relative_install_path: "bionic-loader-test-libs/ns2", relative_install_path: "bionic-loader-test-libs/ns2",
// Mark the library DF_1_GLOBAL so it is added to every linker namespace. // 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 { cc_test_library {
@ -1541,7 +1540,6 @@ cc_test_library {
srcs: ["segment_gap_inner.cpp"], srcs: ["segment_gap_inner.cpp"],
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Check that we support all kinds of relocations: regular, "relocation packer", // Check that we support all kinds of relocations: regular, "relocation packer",
// and both the old and new SHT_RELR constants. // and both the old and new SHT_RELR constants.
@ -1590,129 +1588,153 @@ cc_test_library {
} }
cc_defaults { cc_defaults {
name: "bionic_targets_only", name: "bionic_targets_only",
enabled: false, enabled: false,
target: { target: {
android: { android: {
enabled: true, enabled: true,
}, },
linux_bionic: { linux_bionic: {
enabled: true, enabled: true,
}, },
}, },
} }
cc_test { cc_test {
name: "heap_tagging_sync_helper", name: "heap_tagging_sync_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"], defaults: [
srcs: ["heap_tagging_helper.cpp"], "bionic_testlib_defaults",
sanitize: { "bionic_targets_only",
memtag_heap: true, ],
diag: { srcs: ["heap_tagging_helper.cpp"],
memtag_heap: true, sanitize: {
}, memtag_heap: true,
hwaddress: false, diag: {
}, memtag_heap: true,
},
hwaddress: false,
},
} }
cc_test { cc_test {
name: "heap_tagging_async_helper", name: "heap_tagging_async_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"], defaults: [
srcs: ["heap_tagging_helper.cpp"], "bionic_testlib_defaults",
sanitize: { "bionic_targets_only",
memtag_heap: true, ],
diag: { srcs: ["heap_tagging_helper.cpp"],
memtag_heap: false, sanitize: {
}, memtag_heap: true,
hwaddress: false, diag: {
}, memtag_heap: false,
},
hwaddress: false,
},
} }
cc_test { cc_test {
name: "heap_tagging_disabled_helper", name: "heap_tagging_disabled_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"], defaults: [
srcs: ["heap_tagging_helper.cpp"], "bionic_testlib_defaults",
sanitize: { "bionic_targets_only",
memtag_heap: false, ],
hwaddress: false, srcs: ["heap_tagging_helper.cpp"],
}, sanitize: {
memtag_heap: false,
hwaddress: false,
},
} }
cc_test { cc_test {
name: "heap_tagging_static_sync_helper", name: "heap_tagging_static_sync_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"], defaults: [
srcs: ["heap_tagging_helper.cpp"], "bionic_testlib_defaults",
static_executable: true, "bionic_targets_only",
sanitize: { ],
memtag_heap: true, srcs: ["heap_tagging_helper.cpp"],
diag: { static_executable: true,
memtag_heap: true, sanitize: {
}, memtag_heap: true,
hwaddress: false, diag: {
}, memtag_heap: true,
},
hwaddress: false,
},
} }
cc_test { cc_test {
name: "heap_tagging_static_async_helper", name: "heap_tagging_static_async_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"], defaults: [
srcs: ["heap_tagging_helper.cpp"], "bionic_testlib_defaults",
static_executable: true, "bionic_targets_only",
sanitize: { ],
memtag_heap: true, srcs: ["heap_tagging_helper.cpp"],
diag: { static_executable: true,
memtag_heap: false, sanitize: {
}, memtag_heap: true,
hwaddress: false, diag: {
}, memtag_heap: false,
},
hwaddress: false,
},
} }
cc_test { cc_test {
name: "heap_tagging_static_disabled_helper", name: "heap_tagging_static_disabled_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"], defaults: [
srcs: ["heap_tagging_helper.cpp"], "bionic_testlib_defaults",
static_executable: true, "bionic_targets_only",
sanitize: { ],
memtag_heap: false, srcs: ["heap_tagging_helper.cpp"],
hwaddress: false, static_executable: true,
}, sanitize: {
memtag_heap: false,
hwaddress: false,
},
} }
cc_test { cc_test {
name: "stack_tagging_helper", name: "stack_tagging_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"], defaults: [
srcs: ["stack_tagging_helper.cpp"], "bionic_testlib_defaults",
sanitize: { "bionic_targets_only",
memtag_heap: true, ],
memtag_stack: true, srcs: ["stack_tagging_helper.cpp"],
diag: { sanitize: {
memtag_heap: true, memtag_heap: true,
}, memtag_stack: true,
hwaddress: false, diag: {
}, memtag_heap: true,
header_libs: ["bionic_libc_platform_headers"], },
cflags: ["-fexceptions"], hwaddress: false,
},
header_libs: ["bionic_libc_platform_headers"],
cflags: ["-fexceptions"],
} }
cc_test { cc_test {
name: "stack_tagging_static_helper", name: "stack_tagging_static_helper",
defaults: ["bionic_testlib_defaults", "bionic_targets_only"], defaults: [
srcs: ["stack_tagging_helper.cpp"], "bionic_testlib_defaults",
static_executable: true, "bionic_targets_only",
sanitize: { ],
memtag_heap: true, srcs: ["stack_tagging_helper.cpp"],
memtag_stack: true, static_executable: true,
diag: { sanitize: {
memtag_heap: true, memtag_heap: true,
}, memtag_stack: true,
hwaddress: false, diag: {
}, memtag_heap: true,
header_libs: ["bionic_libc_platform_headers"], },
cflags: ["-fexceptions"], hwaddress: false,
},
header_libs: ["bionic_libc_platform_headers"],
cflags: ["-fexceptions"],
} }
cc_genrule { cc_genrule {
name: "libdlext_test_zip_zipaligned", name: "libdlext_test_zip_zipaligned",
out: ["bionic-loader-test-libs/libdlext_test_zip/libdlext_test_zip_zipaligned.zip"], out: ["bionic-loader-test-libs/libdlext_test_zip/libdlext_test_zip_zipaligned.zip"],
tools: [ tools: [
"soong_zip", "soong_zip",
"bionic_tests_zipalign", "bionic_tests_zipalign",