Skip to content

Commit fa3a01f

Browse files
Patch both libcs with android_set_abort_message()
Test: build Bug: 180268112 Change-Id: I6cebaeb0ce1855d6573b7e7f38172dc11e9e3e5a
1 parent 7e85e33 commit fa3a01f

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

patches/rustc-0011-Populate-abort-message.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,19 @@ index 9690996e602..b19f14983ce 100644
9494
abort();
9595

9696
cfg_if::cfg_if! {
97+
diff --git a/vendor/libc/src/unix/linux_like/android/mod.rs b/vendor/libc/src/unix/linux_like/android/mod.rs
98+
index 079de283f89..da74c7cdb35 100644
99+
--- a/vendor/libc/src/unix/linux_like/android/mod.rs
100+
+++ b/vendor/libc/src/unix/linux_like/android/mod.rs
101+
@@ -2748,6 +2748,8 @@ extern "C" {
102+
) -> ::size_t;
103+
104+
pub fn regfree(preg: *mut ::regex_t);
105+
+
106+
+ pub fn android_set_abort_message(msg: *const ::c_char);
107+
}
108+
109+
cfg_if! {
97110
diff --git a/vendor/libc-0.2.79/src/unix/linux_like/android/mod.rs b/vendor/libc-0.2.79/src/unix/linux_like/android/mod.rs
98111
index 079de283f89..da74c7cdb35 100644
99112
--- a/vendor/libc-0.2.79/src/unix/linux_like/android/mod.rs

0 commit comments

Comments
 (0)