diff options
| author | Thiébaud Weksteen <tweek@google.com> | 2021-01-25 20:55:56 +0100 |
|---|---|---|
| committer | Jeffrey Vander Stoep <jeffv@google.com> | 2021-01-26 14:24:32 +0000 |
| commit | dbe9201c82f2f15f88f503ee655ddc895ff70eb2 (patch) | |
| tree | 07ea9c8b20ab0b29dfc9c3dbd275f09cf6962376 | |
| parent | 4e6868a9df81a28485edbaf5cbf128c9f35b2d5c (diff) | |
| download | libc-dbe9201c82f2f15f88f503ee655ddc895ff70eb2.tar.gz | |
android: add android_set_abort_message
As definied in set_abort_message.h [1].
[1] https://android.googlesource.com/platform/bionic/+/master/libc/include/android/set_abort_message.h
CP from: https://github.com/rust-lang/libc/pull/2043/commits/beaf7e49c864e9c76d4c1a5647a9fafdb6333f91
Change-Id: I6a1be44dfc982fa9b725efa1d296f9bddcc0caca
Test: build
Test: atest
Bug: 163343666
| -rw-r--r-- | patches/android_abort.patch | 25 | ||||
| -rw-r--r-- | src/unix/linux_like/android/mod.rs | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/patches/android_abort.patch b/patches/android_abort.patch new file mode 100644 index 00000000..d20d67cd --- /dev/null +++ b/patches/android_abort.patch @@ -0,0 +1,25 @@ +From beaf7e49c864e9c76d4c1a5647a9fafdb6333f91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= <tweek@google.com> +Date: Mon, 25 Jan 2021 20:55:56 +0100 +Subject: [PATCH] android: add android_set_abort_message + +As definied in set_abort_message.h [1]. + +[1] https://android.googlesource.com/platform/bionic/+/master/libc/include/android/set_abort_message.h +--- + src/unix/linux_like/android/mod.rs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs +index b61399b8728..09ecdd62f6b 100644 +--- a/src/unix/linux_like/android/mod.rs ++++ b/src/unix/linux_like/android/mod.rs +@@ -2821,6 +2821,8 @@ extern "C" { + ) -> ::size_t; + + pub fn regfree(preg: *mut ::regex_t); ++ ++ pub fn android_set_abort_message(msg: *const ::c_char); + } + + cfg_if! { diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index 77bb6ac2..2ac05ba6 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -2818,6 +2818,8 @@ extern "C" { ) -> ::size_t; pub fn regfree(preg: *mut ::regex_t); + + pub fn android_set_abort_message(msg: *const ::c_char); } cfg_if! { |