diff options
51 files changed, 57 insertions, 51 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index d41801292..6d4b71960 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1808,6 +1808,7 @@ cc_library_headers { "//frameworks:__subpackages__", "//external/perfetto:__subpackages__", "//external/scudo:__subpackages__", + "//system/core/debuggerd:__subpackages__", ], host_supported: true, recovery_available: true, diff --git a/libc/bionic/__libc_current_sigrtmin.cpp b/libc/bionic/__libc_current_sigrtmin.cpp index d2ea75d11..e6b3412b7 100644 --- a/libc/bionic/__libc_current_sigrtmin.cpp +++ b/libc/bionic/__libc_current_sigrtmin.cpp @@ -28,7 +28,7 @@ #include <signal.h> -#include "private/sigrtmin.h" +#include <platform/bionic/reserved_signals.h> int __libc_current_sigrtmin() { return __SIGRTMIN + __SIGRT_RESERVED; diff --git a/libc/bionic/bionic_allocator.cpp b/libc/bionic/bionic_allocator.cpp index 7fd7067b1..b6d6ba73f 100644 --- a/libc/bionic/bionic_allocator.cpp +++ b/libc/bionic/bionic_allocator.cpp @@ -41,7 +41,7 @@ #include <async_safe/CHECK.h> #include "platform/bionic/page.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" // // BionicAllocator is a general purpose allocator designed to provide the same diff --git a/libc/bionic/bionic_elf_tls.cpp b/libc/bionic/bionic_elf_tls.cpp index 3fa5182a9..61d826c02 100644 --- a/libc/bionic/bionic_elf_tls.cpp +++ b/libc/bionic/bionic_elf_tls.cpp @@ -36,7 +36,7 @@ #include "private/ScopedRWLock.h" #include "private/ScopedSignalBlocker.h" #include "private/bionic_globals.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/bionic_tls.h" #include "pthread_internal.h" diff --git a/libc/bionic/clone.cpp b/libc/bionic/clone.cpp index 2a6ab41b8..622ca265a 100644 --- a/libc/bionic/clone.cpp +++ b/libc/bionic/clone.cpp @@ -35,7 +35,7 @@ #include "pthread_internal.h" #include "private/bionic_defs.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" extern "C" pid_t __bionic_clone(uint32_t flags, void* child_stack, int* parent_tid, void* tls, int* child_tid, int (*fn)(void*), void* arg); extern "C" __noreturn void __exit(int status); diff --git a/libc/bionic/fdsan.cpp b/libc/bionic/fdsan.cpp index 4ebc796d2..d4ac71cfe 100644 --- a/libc/bionic/fdsan.cpp +++ b/libc/bionic/fdsan.cpp @@ -40,6 +40,7 @@ #include <unistd.h> #include <async_safe/log.h> +#include <platform/bionic/reserved_signals.h> #include <sys/system_properties.h> #include "private/bionic_globals.h" @@ -168,8 +169,7 @@ __printflike(1, 0) static void fdsan_error(const char* fmt, ...) { ANDROID_FDSAN_ERROR_LEVEL_DISABLED); __BIONIC_FALLTHROUGH; case ANDROID_FDSAN_ERROR_LEVEL_WARN_ALWAYS: - // DEBUGGER_SIGNAL - inline_raise(__SIGRTMIN + 3, &abort_message); + inline_raise(BIONIC_SIGNAL_DEBUGGER, &abort_message); break; case ANDROID_FDSAN_ERROR_LEVEL_FATAL: diff --git a/libc/bionic/grp_pwd.cpp b/libc/bionic/grp_pwd.cpp index 6f8c07e48..dd8df95f2 100644 --- a/libc/bionic/grp_pwd.cpp +++ b/libc/bionic/grp_pwd.cpp @@ -44,7 +44,7 @@ #include "private/ErrnoRestorer.h" #include "private/android_filesystem_config.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" // Generated android_ids array #include "generated_android_ids.h" diff --git a/libc/bionic/grp_pwd_file.h b/libc/bionic/grp_pwd_file.h index 9004c4ef1..69c771bc3 100644 --- a/libc/bionic/grp_pwd_file.h +++ b/libc/bionic/grp_pwd_file.h @@ -32,7 +32,7 @@ #include <pwd.h> #include "private/bionic_lock.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/grp_pwd.h" class MmapFile { diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp index ca94652ed..aafefabde 100644 --- a/libc/bionic/libc_init_dynamic.cpp +++ b/libc/bionic/libc_init_dynamic.cpp @@ -53,7 +53,7 @@ #include "private/bionic_elf_tls.h" #include "private/bionic_globals.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/bionic_ssp.h" #include "private/bionic_tls.h" #include "private/KernelArgumentBlock.h" diff --git a/libc/bionic/libc_init_static.cpp b/libc/bionic/libc_init_static.cpp index d2a5334e8..1ac475019 100644 --- a/libc/bionic/libc_init_static.cpp +++ b/libc/bionic/libc_init_static.cpp @@ -43,7 +43,7 @@ #include "private/bionic_call_ifunc_resolver.h" #include "private/bionic_elf_tls.h" #include "private/bionic_globals.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/bionic_tls.h" #include "private/KernelArgumentBlock.h" diff --git a/libc/bionic/locale.cpp b/libc/bionic/locale.cpp index 8358fb0ab..0b7037afe 100644 --- a/libc/bionic/locale.cpp +++ b/libc/bionic/locale.cpp @@ -35,7 +35,7 @@ #include <time.h> #include <wchar.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #if defined(__BIONIC_BUILD_FOR_ANDROID_SUPPORT) #define USE_TLS_SLOT 0 diff --git a/libc/bionic/mmap.cpp b/libc/bionic/mmap.cpp index 35033199a..9aad0b315 100644 --- a/libc/bionic/mmap.cpp +++ b/libc/bionic/mmap.cpp @@ -31,7 +31,7 @@ #include <sys/mman.h> #include <unistd.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/ErrnoRestorer.h" // mmap2(2) is like mmap(2), but the offset is in 4096-byte blocks, not bytes. diff --git a/libc/bionic/mremap.cpp b/libc/bionic/mremap.cpp index a4e5323f7..d7c9353e0 100644 --- a/libc/bionic/mremap.cpp +++ b/libc/bionic/mremap.cpp @@ -32,7 +32,7 @@ #include <stdint.h> #include <unistd.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" extern "C" void* __mremap(void*, size_t, size_t, int, void*); diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp index c816830e4..e9a5b5b79 100644 --- a/libc/bionic/ndk_cruft.cpp +++ b/libc/bionic/ndk_cruft.cpp @@ -45,7 +45,7 @@ #include <unistd.h> #include <wchar.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" extern "C" { diff --git a/libc/bionic/poll.cpp b/libc/bionic/poll.cpp index 41b26571b..329031530 100644 --- a/libc/bionic/poll.cpp +++ b/libc/bionic/poll.cpp @@ -30,8 +30,9 @@ #include <sys/poll.h> #include <sys/select.h> +#include <platform/bionic/reserved_signals.h> + #include "private/bionic_time_conversions.h" -#include "private/sigrtmin.h" #include "private/SigSetConverter.h" extern "C" int __ppoll(pollfd*, unsigned int, timespec*, const sigset64_t*, size_t); diff --git a/libc/bionic/pthread_atfork.cpp b/libc/bionic/pthread_atfork.cpp index fb12a3ba7..0dcabdfb2 100644 --- a/libc/bionic/pthread_atfork.cpp +++ b/libc/bionic/pthread_atfork.cpp @@ -30,7 +30,7 @@ #include <pthread.h> #include <stdlib.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" struct atfork_t { atfork_t* next; diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp index 03af2d94a..4f7ac2bb2 100644 --- a/libc/bionic/pthread_create.cpp +++ b/libc/bionic/pthread_create.cpp @@ -42,7 +42,7 @@ #include "private/bionic_constants.h" #include "private/bionic_defs.h" #include "private/bionic_globals.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/bionic_ssp.h" #include "private/bionic_systrace.h" #include "private/bionic_tls.h" diff --git a/libc/bionic/scandir.cpp b/libc/bionic/scandir.cpp index 0b390494d..6a7e36874 100644 --- a/libc/bionic/scandir.cpp +++ b/libc/bionic/scandir.cpp @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/ScopedReaddir.h" // A smart pointer to the scandir dirent**. diff --git a/libc/bionic/scudo/scudo.cpp b/libc/bionic/scudo/scudo.cpp index fb09b929c..2cd36b1b0 100644 --- a/libc/bionic/scudo/scudo.cpp +++ b/libc/bionic/scudo/scudo.cpp @@ -33,7 +33,7 @@ #include <sys/param.h> #include <sys/prctl.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "scudo.h" diff --git a/libc/bionic/sigaction.cpp b/libc/bionic/sigaction.cpp index 96e6f3c31..583bf32ce 100644 --- a/libc/bionic/sigaction.cpp +++ b/libc/bionic/sigaction.cpp @@ -29,7 +29,7 @@ #include <signal.h> #include <string.h> -#include "private/sigrtmin.h" +#include <platform/bionic/reserved_signals.h> extern "C" void __restore_rt(void); extern "C" void __restore(void); diff --git a/libc/bionic/signal.cpp b/libc/bionic/signal.cpp index 8246cb4af..b581b5a2e 100644 --- a/libc/bionic/signal.cpp +++ b/libc/bionic/signal.cpp @@ -36,9 +36,10 @@ #include <time.h> #include <unistd.h> +#include <platform/bionic/reserved_signals.h> + #include "private/ErrnoRestorer.h" #include "private/SigSetConverter.h" -#include "private/sigrtmin.h" extern "C" int __rt_sigpending(const sigset64_t*, size_t); extern "C" int __rt_sigqueueinfo(pid_t, int, siginfo_t*); diff --git a/libc/bionic/sigprocmask.cpp b/libc/bionic/sigprocmask.cpp index 5f70f328f..8781c9b4d 100644 --- a/libc/bionic/sigprocmask.cpp +++ b/libc/bionic/sigprocmask.cpp @@ -29,7 +29,8 @@ #include <errno.h> #include <signal.h> -#include "private/sigrtmin.h" +#include <platform/bionic/reserved_signals.h> + #include "private/SigSetConverter.h" extern "C" int __rt_sigprocmask(int, const sigset64_t*, sigset64_t*, size_t); diff --git a/libc/bionic/system_property_set.cpp b/libc/bionic/system_property_set.cpp index e981a58d9..56822acbd 100644 --- a/libc/bionic/system_property_set.cpp +++ b/libc/bionic/system_property_set.cpp @@ -45,7 +45,7 @@ #include <async_safe/CHECK.h> #include "private/bionic_defs.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/ScopedFd.h" static const char property_service_socket[] = "/dev/socket/" PROP_SERVICE_NAME; diff --git a/libc/malloc_debug/Config.cpp b/libc/malloc_debug/Config.cpp index dbd3eac4a..11887e295 100644 --- a/libc/malloc_debug/Config.cpp +++ b/libc/malloc_debug/Config.cpp @@ -38,7 +38,7 @@ #include <string> #include <vector> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> #include "Config.h" #include "debug_log.h" diff --git a/libc/malloc_debug/DebugData.h b/libc/malloc_debug/DebugData.h index 3a3629981..13bba48df 100644 --- a/libc/malloc_debug/DebugData.h +++ b/libc/malloc_debug/DebugData.h @@ -33,7 +33,7 @@ #include <memory> #include <vector> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> #include "Config.h" #include "GuardData.h" diff --git a/libc/malloc_debug/GuardData.h b/libc/malloc_debug/GuardData.h index b6ec889c7..58e33e917 100644 --- a/libc/malloc_debug/GuardData.h +++ b/libc/malloc_debug/GuardData.h @@ -33,7 +33,7 @@ #include <vector> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> #include "OptionData.h" diff --git a/libc/malloc_debug/MapData.h b/libc/malloc_debug/MapData.h index 5b08b909b..f2b3c1cfe 100644 --- a/libc/malloc_debug/MapData.h +++ b/libc/malloc_debug/MapData.h @@ -34,7 +34,7 @@ #include <set> #include <string> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> struct MapEntry { MapEntry(uintptr_t start, uintptr_t end, uintptr_t offset, const char* name, size_t name_len, int flags) diff --git a/libc/malloc_debug/PointerData.cpp b/libc/malloc_debug/PointerData.cpp index b1e28b712..4f81ff7ff 100644 --- a/libc/malloc_debug/PointerData.cpp +++ b/libc/malloc_debug/PointerData.cpp @@ -43,7 +43,7 @@ #include <android-base/stringprintf.h> #include <android-base/thread_annotations.h> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> #include "Config.h" #include "DebugData.h" diff --git a/libc/malloc_debug/PointerData.h b/libc/malloc_debug/PointerData.h index 78f0ed862..37d87db1a 100644 --- a/libc/malloc_debug/PointerData.h +++ b/libc/malloc_debug/PointerData.h @@ -38,7 +38,7 @@ #include <unordered_map> #include <vector> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> #include <unwindstack/LocalUnwinder.h> #include "OptionData.h" diff --git a/libc/malloc_debug/RecordData.h b/libc/malloc_debug/RecordData.h index a01588214..3d37529d6 100644 --- a/libc/malloc_debug/RecordData.h +++ b/libc/malloc_debug/RecordData.h @@ -36,7 +36,7 @@ #include <mutex> #include <string> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> class RecordEntry { public: diff --git a/libc/malloc_debug/debug_disable.h b/libc/malloc_debug/debug_disable.h index f9c3149ee..984bc2592 100644 --- a/libc/malloc_debug/debug_disable.h +++ b/libc/malloc_debug/debug_disable.h @@ -30,7 +30,7 @@ #include <sys/cdefs.h> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> // ============================================================================= // Used to disable the debug allocation calls. diff --git a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp index 70457b9ad..c405c7f20 100644 --- a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp +++ b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp @@ -41,7 +41,7 @@ #include <android-base/stringprintf.h> #include <android-base/strings.h> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> #include <private/bionic_malloc_dispatch.h> #include "Config.h" diff --git a/libc/private/bionic_macros.h b/libc/platform/bionic/macros.h index 54903f55f..54903f55f 100644 --- a/libc/private/bionic_macros.h +++ b/libc/platform/bionic/macros.h diff --git a/libc/private/sigrtmin.h b/libc/platform/bionic/reserved_signals.h index 5de1a32ae..f062b1cad 100644 --- a/libc/private/sigrtmin.h +++ b/libc/platform/bionic/reserved_signals.h @@ -32,13 +32,13 @@ #include <signal.h> -#include "bionic_macros.h" +#include "macros.h" // Realtime signals reserved for internal use: // 32 (__SIGRTMIN + 0) POSIX timers // 33 (__SIGRTMIN + 1) libbacktrace // 34 (__SIGRTMIN + 2) libcore -// 35 (__SIGRTMIN + 3) debuggerd -b +// 35 (__SIGRTMIN + 3) debuggerd // 36 (__SIGRTMIN + 4) heapprofd native dumps // 37 (__SIGRTMIN + 5) coverage (libprofile-extras) // 38 (__SIGRTMIN + 6) heapprofd ART managed heap dumps @@ -46,6 +46,8 @@ // If you change this, also change __ndk_legacy___libc_current_sigrtmin // in <android/legacy_signal_inlines.h> to match. +#define BIONIC_SIGNAL_DEBUGGER __SIGRTMIN + 3 + #define __SIGRT_RESERVED 7 static inline __always_inline sigset64_t filter_reserved_signals(sigset64_t sigset, int how) { int (*block)(sigset64_t*, int); diff --git a/libc/private/CFIShadow.h b/libc/private/CFIShadow.h index 84fbea5a6..ec87e3c72 100644 --- a/libc/private/CFIShadow.h +++ b/libc/private/CFIShadow.h @@ -20,7 +20,7 @@ #include <stdint.h> #include "platform/bionic/page.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" constexpr unsigned kLibraryAlignmentBits = 18; constexpr size_t kLibraryAlignment = 1UL << kLibraryAlignmentBits; diff --git a/libc/private/ErrnoRestorer.h b/libc/private/ErrnoRestorer.h index 52e115a89..cecf10382 100644 --- a/libc/private/ErrnoRestorer.h +++ b/libc/private/ErrnoRestorer.h @@ -18,7 +18,7 @@ #include <errno.h> -#include "bionic_macros.h" +#include "platform/bionic/macros.h" class ErrnoRestorer { public: diff --git a/libc/private/KernelArgumentBlock.h b/libc/private/KernelArgumentBlock.h index c8ce8411f..ee28d69f9 100644 --- a/libc/private/KernelArgumentBlock.h +++ b/libc/private/KernelArgumentBlock.h @@ -21,7 +21,7 @@ #include <stdint.h> #include <sys/auxv.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" // When the kernel starts the dynamic linker, it passes a pointer to a block // of memory containing argc, the argv array, the environment variable array, diff --git a/libc/private/MallocXmlElem.h b/libc/private/MallocXmlElem.h index a36797261..f8c72ab40 100644 --- a/libc/private/MallocXmlElem.h +++ b/libc/private/MallocXmlElem.h @@ -20,7 +20,7 @@ #include <stdio.h> #include <unistd.h> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> class MallocXmlElem { public: diff --git a/libc/private/ScopedFd.h b/libc/private/ScopedFd.h index 1cec91683..ea7f59ee3 100644 --- a/libc/private/ScopedFd.h +++ b/libc/private/ScopedFd.h @@ -30,7 +30,7 @@ #include <unistd.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "private/ErrnoRestorer.h" class ScopedFd final { diff --git a/libc/private/ScopedPthreadMutexLocker.h b/libc/private/ScopedPthreadMutexLocker.h index 1c1e4a730..a87750cef 100644 --- a/libc/private/ScopedPthreadMutexLocker.h +++ b/libc/private/ScopedPthreadMutexLocker.h @@ -18,7 +18,7 @@ #include <pthread.h> -#include "bionic_macros.h" +#include "platform/bionic/macros.h" class ScopedPthreadMutexLocker { public: diff --git a/libc/private/ScopedRWLock.h b/libc/private/ScopedRWLock.h index f0345051c..0af372b97 100644 --- a/libc/private/ScopedRWLock.h +++ b/libc/private/ScopedRWLock.h @@ -30,7 +30,7 @@ #include <pthread.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" template <bool write> class ScopedRWLock { public: diff --git a/libc/private/ScopedReaddir.h b/libc/private/ScopedReaddir.h index 9a20c0916..7b07921d3 100644 --- a/libc/private/ScopedReaddir.h +++ b/libc/private/ScopedReaddir.h @@ -18,7 +18,7 @@ #include <dirent.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" class ScopedReaddir { public: diff --git a/libc/private/ScopedSignalBlocker.h b/libc/private/ScopedSignalBlocker.h index 10aacb368..ce0ae64d0 100644 --- a/libc/private/ScopedSignalBlocker.h +++ b/libc/private/ScopedSignalBlocker.h @@ -18,7 +18,7 @@ #include <signal.h> -#include "bionic_macros.h" +#include "platform/bionic/macros.h" class ScopedSignalBlocker { public: diff --git a/libc/private/WriteProtected.h b/libc/private/WriteProtected.h index 26c239ca1..8f5b32d7a 100644 --- a/libc/private/WriteProtected.h +++ b/libc/private/WriteProtected.h @@ -24,7 +24,7 @@ #include <async_safe/log.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" template <typename T> union WriteProtectedContents { diff --git a/libc/private/bionic_lock.h b/libc/private/bionic_lock.h index d70ba6c5c..8ed49394b 100644 --- a/libc/private/bionic_lock.h +++ b/libc/private/bionic_lock.h @@ -30,7 +30,7 @@ #include <stdatomic.h> #include "private/bionic_futex.h" -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" // Lock is used in places like pthread_rwlock_t, which can be initialized without calling // an initialization function. So make sure Lock can be initialized by setting its memory to 0. diff --git a/libc/private/bionic_systrace.h b/libc/private/bionic_systrace.h index 86d2a08c5..dbe173919 100644 --- a/libc/private/bionic_systrace.h +++ b/libc/private/bionic_systrace.h @@ -16,7 +16,7 @@ #pragma once -#include "bionic_macros.h" +#include "platform/bionic/macros.h" // Tracing class for bionic. To begin a trace at a specified point: // ScopedTrace("Trace message"); diff --git a/libc/private/bionic_tls.h b/libc/private/bionic_tls.h index 9a8014067..bb5c67ba0 100644 --- a/libc/private/bionic_tls.h +++ b/libc/private/bionic_tls.h @@ -36,7 +36,7 @@ #include <platform/bionic/tls.h> -#include "bionic_macros.h" +#include "platform/bionic/macros.h" #include "grp_pwd.h" /** WARNING WARNING WARNING diff --git a/libc/stdio/printf_common.h b/libc/stdio/printf_common.h index ad4fe35f9..4dc5ca126 100644 --- a/libc/stdio/printf_common.h +++ b/libc/stdio/printf_common.h @@ -48,7 +48,7 @@ #include <unistd.h> #include <wchar.h> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> #include "fvwrite.h" #include "gdtoa.h" diff --git a/libc/stdio/vfscanf.cpp b/libc/stdio/vfscanf.cpp index 6fb49c9d0..ad20ba48d 100644 --- a/libc/stdio/vfscanf.cpp +++ b/libc/stdio/vfscanf.cpp @@ -43,7 +43,7 @@ #include <private/bionic_ctype.h> #include <private/bionic_fortify.h> -#include <private/bionic_macros.h> +#include <platform/bionic/macros.h> #include <private/bionic_mbstate.h> #define BUF 513 /* Maximum length of numeric string. */ diff --git a/libc/system_properties/include/system_properties/prop_area.h b/libc/system_properties/include/system_properties/prop_area.h index 53b27457e..e32a8d7ee 100644 --- a/libc/system_properties/include/system_properties/prop_area.h +++ b/libc/system_properties/include/system_properties/prop_area.h @@ -33,7 +33,7 @@ #include <string.h> #include <sys/mman.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" #include "prop_info.h" diff --git a/libc/system_properties/include/system_properties/prop_info.h b/libc/system_properties/include/system_properties/prop_info.h index 27b29c8b7..3ebe7c51f 100644 --- a/libc/system_properties/include/system_properties/prop_info.h +++ b/libc/system_properties/include/system_properties/prop_info.h @@ -32,7 +32,7 @@ #include <stdint.h> #include <sys/system_properties.h> -#include "private/bionic_macros.h" +#include "platform/bionic/macros.h" // The C11 standard doesn't allow atomic loads from const fields, // though C++11 does. Fudge it until standards get straightened out. |