diff --git a/apex/Android.bp b/apex/Android.bp index 6201ad12f..3529a2ebf 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -43,7 +43,10 @@ apex { ], arch: { arm64: { - native_shared_libs: ["libc_hwasan", "libclang_rt.hwasan"], + native_shared_libs: [ + "libc_hwasan", + "libclang_rt.hwasan", + ], }, }, binaries: [ diff --git a/benchmarks/linker_relocation/Android.bp b/benchmarks/linker_relocation/Android.bp index b78eb8edb..5c8793bd5 100644 --- a/benchmarks/linker_relocation/Android.bp +++ b/benchmarks/linker_relocation/Android.bp @@ -68,8 +68,12 @@ cc_defaults { compile_multilib: "both", multilib: { - lib32: { suffix: "32" }, - lib64: { suffix: "64" }, + lib32: { + suffix: "32", + }, + lib64: { + suffix: "64", + }, }, } diff --git a/libc/Android.bp b/libc/Android.bp index 02e3e117a..61ef29d88 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -93,7 +93,7 @@ cc_defaults { 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 @@ cc_library_static { }, defaults: ["libc_defaults"], - cflags: ["-fno-stack-protector", "-ffreestanding"], + cflags: [ + "-fno-stack-protector", + "-ffreestanding", + ], name: "libc_bootstrap", } @@ -808,8 +811,8 @@ cc_library_static { }, 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 @@ 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", @@ -1844,7 +1847,7 @@ cc_defaults { cc_library { name: "libc", - defaults: [ + defaults: [ "libc_library_defaults", ], stubs: { @@ -1866,7 +1869,7 @@ cc_library { cc_library { name: "libc_hwasan", - defaults: [ + defaults: [ "libc_library_defaults", ], sanitize: { @@ -2257,7 +2260,7 @@ cc_object { 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 @@ cc_object { "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 @@ cc_object { 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 @@ cc_object { 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_object { 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 { 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 @@ cc_library_static { }, riscv64: { srcs: [ - "arch-riscv64/string/__memcpy_chk.S", + "arch-riscv64/string/__memcpy_chk.S", ], }, }, @@ -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, + }, }, } @@ -2866,37 +2898,37 @@ cc_library { 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 @@ cc_genrule { // 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 eb690dd35..c7de2cec4 100644 --- a/libc/async_safe/Android.bp +++ b/libc/async_safe/Android.bp @@ -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"], diff --git a/libc/malloc_hooks/Android.bp b/libc/malloc_hooks/Android.bp index 6b4e6065c..f5b3848a2 100644 --- a/libc/malloc_hooks/Android.bp +++ b/libc/malloc_hooks/Android.bp @@ -75,7 +75,7 @@ cc_test { local_include_dirs: ["tests"], include_dirs: [ "bionic/libc", - "bionic" + "bionic", ], header_libs: [ "bionic_libc_platform_headers", @@ -84,7 +84,7 @@ cc_test { 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"], } diff --git a/libdl/Android.bp b/libdl/Android.bp index c7d7cf300..95b412b96 100644 --- a/libdl/Android.bp +++ b/libdl/Android.bp @@ -193,7 +193,7 @@ cc_library { }, }, - srcs: [ "libdl_android.cpp" ], + srcs: ["libdl_android.cpp"], version_script: "libdl_android.map.txt", cflags: [ diff --git a/linker/Android.bp b/linker/Android.bp index 4787d87bf..32305c8b4 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -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, diff --git a/tests/Android.bp b/tests/Android.bp index a53418aa0..960131bf6 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -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"], } diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp index 0bef469da..89e9b5d59 100644 --- a/tests/libs/Android.bp +++ b/tests/libs/Android.bp @@ -83,19 +83,18 @@ cc_test_library { } cc_test { - name: "thread_exit_cb_helper", - defaults: ["bionic_testlib_defaults"], - srcs: ["thread_exit_cb_helper.cpp"], + name: "thread_exit_cb_helper", + defaults: ["bionic_testlib_defaults"], + srcs: ["thread_exit_cb_helper.cpp"], } cc_test { - name: "tls_properties_helper", - defaults: ["bionic_testlib_defaults"], - srcs: ["tls_properties_helper.cpp"], - shared_libs: ["libtest_elftls_shared_var"], + name: "tls_properties_helper", + defaults: ["bionic_testlib_defaults"], + srcs: ["tls_properties_helper.cpp"], + 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. @@ -1590,129 +1588,153 @@ cc_test_library { } cc_defaults { - name: "bionic_targets_only", - enabled: false, - target: { - android: { - enabled: true, - }, - linux_bionic: { - enabled: true, - }, - }, + name: "bionic_targets_only", + enabled: false, + target: { + android: { + enabled: true, + }, + linux_bionic: { + enabled: true, + }, + }, } cc_test { - name: "heap_tagging_sync_helper", - defaults: ["bionic_testlib_defaults", "bionic_targets_only"], - srcs: ["heap_tagging_helper.cpp"], - sanitize: { - memtag_heap: true, - diag: { - memtag_heap: true, - }, - hwaddress: false, - }, + name: "heap_tagging_sync_helper", + defaults: [ + "bionic_testlib_defaults", + "bionic_targets_only", + ], + srcs: ["heap_tagging_helper.cpp"], + sanitize: { + memtag_heap: true, + diag: { + memtag_heap: true, + }, + hwaddress: false, + }, } cc_test { - name: "heap_tagging_async_helper", - defaults: ["bionic_testlib_defaults", "bionic_targets_only"], - srcs: ["heap_tagging_helper.cpp"], - sanitize: { - memtag_heap: true, - diag: { - memtag_heap: false, - }, - hwaddress: false, - }, + name: "heap_tagging_async_helper", + defaults: [ + "bionic_testlib_defaults", + "bionic_targets_only", + ], + srcs: ["heap_tagging_helper.cpp"], + sanitize: { + memtag_heap: true, + diag: { + memtag_heap: false, + }, + hwaddress: false, + }, } cc_test { - name: "heap_tagging_disabled_helper", - defaults: ["bionic_testlib_defaults", "bionic_targets_only"], - srcs: ["heap_tagging_helper.cpp"], - sanitize: { - memtag_heap: false, - hwaddress: false, - }, + name: "heap_tagging_disabled_helper", + defaults: [ + "bionic_testlib_defaults", + "bionic_targets_only", + ], + srcs: ["heap_tagging_helper.cpp"], + sanitize: { + memtag_heap: false, + hwaddress: false, + }, } cc_test { - name: "heap_tagging_static_sync_helper", - defaults: ["bionic_testlib_defaults", "bionic_targets_only"], - srcs: ["heap_tagging_helper.cpp"], - static_executable: true, - sanitize: { - memtag_heap: true, - diag: { - memtag_heap: true, - }, - hwaddress: false, - }, + name: "heap_tagging_static_sync_helper", + defaults: [ + "bionic_testlib_defaults", + "bionic_targets_only", + ], + srcs: ["heap_tagging_helper.cpp"], + static_executable: true, + sanitize: { + memtag_heap: true, + diag: { + memtag_heap: true, + }, + hwaddress: false, + }, } cc_test { - name: "heap_tagging_static_async_helper", - defaults: ["bionic_testlib_defaults", "bionic_targets_only"], - srcs: ["heap_tagging_helper.cpp"], - static_executable: true, - sanitize: { - memtag_heap: true, - diag: { - memtag_heap: false, - }, - hwaddress: false, - }, + name: "heap_tagging_static_async_helper", + defaults: [ + "bionic_testlib_defaults", + "bionic_targets_only", + ], + srcs: ["heap_tagging_helper.cpp"], + static_executable: true, + sanitize: { + memtag_heap: true, + diag: { + memtag_heap: false, + }, + hwaddress: false, + }, } cc_test { - name: "heap_tagging_static_disabled_helper", - defaults: ["bionic_testlib_defaults", "bionic_targets_only"], - srcs: ["heap_tagging_helper.cpp"], - static_executable: true, - sanitize: { - memtag_heap: false, - hwaddress: false, - }, + name: "heap_tagging_static_disabled_helper", + defaults: [ + "bionic_testlib_defaults", + "bionic_targets_only", + ], + srcs: ["heap_tagging_helper.cpp"], + static_executable: true, + sanitize: { + memtag_heap: false, + hwaddress: false, + }, } cc_test { - name: "stack_tagging_helper", - defaults: ["bionic_testlib_defaults", "bionic_targets_only"], - srcs: ["stack_tagging_helper.cpp"], - sanitize: { - memtag_heap: true, - memtag_stack: true, - diag: { - memtag_heap: true, - }, - hwaddress: false, - }, - header_libs: ["bionic_libc_platform_headers"], - cflags: ["-fexceptions"], + name: "stack_tagging_helper", + defaults: [ + "bionic_testlib_defaults", + "bionic_targets_only", + ], + srcs: ["stack_tagging_helper.cpp"], + sanitize: { + memtag_heap: true, + memtag_stack: true, + diag: { + memtag_heap: true, + }, + hwaddress: false, + }, + header_libs: ["bionic_libc_platform_headers"], + cflags: ["-fexceptions"], } cc_test { - name: "stack_tagging_static_helper", - defaults: ["bionic_testlib_defaults", "bionic_targets_only"], - srcs: ["stack_tagging_helper.cpp"], - static_executable: true, - sanitize: { - memtag_heap: true, - memtag_stack: true, - diag: { - memtag_heap: true, - }, - hwaddress: false, - }, - header_libs: ["bionic_libc_platform_headers"], - cflags: ["-fexceptions"], + name: "stack_tagging_static_helper", + defaults: [ + "bionic_testlib_defaults", + "bionic_targets_only", + ], + srcs: ["stack_tagging_helper.cpp"], + static_executable: true, + sanitize: { + memtag_heap: true, + memtag_stack: true, + diag: { + memtag_heap: true, + }, + hwaddress: false, + }, + header_libs: ["bionic_libc_platform_headers"], + cflags: ["-fexceptions"], } cc_genrule { 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: [ "soong_zip", "bionic_tests_zipalign",