Merge "Remove unused includes and `extern`s." into main
diff --git a/libc/bionic/libc_init_static.cpp b/libc/bionic/libc_init_static.cpp index 85e742c..ef9f896 100644 --- a/libc/bionic/libc_init_static.cpp +++ b/libc/bionic/libc_init_static.cpp
@@ -28,34 +28,25 @@ #include <android/api-level.h> #include <elf.h> -#include <errno.h> #include <malloc.h> #include <signal.h> #include <stddef.h> -#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <sys/auxv.h> #include <sys/mman.h> #include "async_safe/log.h" -#include "heap_tagging.h" #include "libc_init_common.h" #include "platform/bionic/macros.h" -#include "platform/bionic/mte.h" #include "platform/bionic/page.h" #include "platform/bionic/reserved_signals.h" #include "private/KernelArgumentBlock.h" -#include "private/bionic_asm.h" -#include "private/bionic_asm_note.h" #include "private/bionic_call_ifunc_resolver.h" #include "private/bionic_elf_tls.h" #include "private/bionic_globals.h" #include "private/bionic_tls.h" -#include "private/elf_note.h" #include "pthread_internal.h" -#include "sys/system_properties.h" -#include "sysprop_helpers.h" #if __has_feature(hwaddress_sanitizer) #include <sanitizer/hwasan_interface.h> @@ -69,7 +60,6 @@ #endif extern "C" int __cxa_atexit(void (*)(void *), void *, void *); -extern "C" const char* __gnu_basename(const char* path); static void call_array(init_func_t** list, size_t count, int argc, char* argv[], char* envp[]) { while (count-- > 0) { @@ -157,6 +147,7 @@ layout.finish_layout(); } + void __libc_init_profiling_handlers() { // The dynamic variant of this function is more interesting, but this // at least ensures that static binaries aren't killed by the kernel's