Move sigrtmin.h into platform headers.
Test: mma
Change-Id: Ibc97ef96fe9e32b948c245b06039b95fe4342f39
diff --git a/libc/Android.bp b/libc/Android.bp
index d418012..6d4b719 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1808,6 +1808,7 @@
"//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 d2ea75d..e6b3412 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/fdsan.cpp b/libc/bionic/fdsan.cpp
index 4ebc796..d4ac71c 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 @@
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/poll.cpp b/libc/bionic/poll.cpp
index 41b2657..3290315 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/sigaction.cpp b/libc/bionic/sigaction.cpp
index 96e6f3c..583bf32 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 8246cb4..b581b5a 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 5f70f32..8781c9b 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/private/sigrtmin.h b/libc/platform/bionic/reserved_signals.h
similarity index 95%
rename from libc/private/sigrtmin.h
rename to libc/platform/bionic/reserved_signals.h
index af73280..f062b1c 100644
--- a/libc/private/sigrtmin.h
+++ b/libc/platform/bionic/reserved_signals.h
@@ -32,13 +32,13 @@
#include <signal.h>
-#include "platform/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);