diff options
| author | bors <bors@rust-lang.org> | 2021-01-28 11:07:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-28 11:07:54 +0000 |
| commit | 024d1515ae17265f89e461712ac1db4f58fed4b5 (patch) | |
| tree | c71cdc6727647657ffbba57283196bcc34c2366d | |
| parent | 6f591dfca59731625715bc477746a55e41972021 (diff) | |
| parent | 9df0cdf5feb4ed444e354d787bbb2e41ac331a6e (diff) | |
| download | rust-libc-024d1515ae17265f89e461712ac1db4f58fed4b5.tar.gz | |
Auto merge of #2043 - tweksteen:set_abort_message, r=JohnTitor
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
| -rwxr-xr-x | libc-test/build.rs | 5 | ||||
| -rw-r--r-- | src/unix/linux_like/android/mod.rs | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index 3cd512a51c..098dde219f 100755 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -1439,6 +1439,11 @@ fn test_android(target: &str) { } + // Include Android-specific headers: + headers! { cfg: + "android/set_abort_message.h" + } + cfg.type_name(move |ty, is_struct, is_union| { match ty { // Just pass all these through, no need for a "struct" prefix diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index b61399b872..09ecdd62f6 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! { |