make abort-on-panic work on Android

rust-lang · Aug 18, 2022 · 4359f43 · 4359f43
1 parent 3ec8dd8
commit 4359f43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ci.sh b/ci.sh
@@ -84,7 +84,7 @@ case $HOST_TARGET in
     MIRI_TEST_TARGET=aarch64-apple-darwin run_tests
     MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
     MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec panic/panic concurrency/simple atomic data_race env/var
-    MIRI_TEST_TARGET=aarch64-linux-android run_tests_minimal hello integer vec
+    MIRI_TEST_TARGET=aarch64-linux-android run_tests_minimal hello integer vec panic/panic
     MIRI_TEST_TARGET=thumbv7em-none-eabihf MIRI_NO_STD=1 run_tests_minimal no_std # no_std embedded architecture
     ;;
   x86_64-apple-darwin)

diff --git a/src/shims/unix/android/dlsym.rs b/src/shims/unix/android/dlsym.rs
@@ -15,6 +15,7 @@ impl Dlsym {
     pub fn from_str<'tcx>(name: &str) -> InterpResult<'tcx, Option<Dlsym>> {
         Ok(match &*name {
             "signal" => Some(Dlsym::signal),
+            "android_set_abort_message" => None,
             _ => throw_unsup_format!("unsupported Android dlsym: {}", name),
         })
     }