commit 118ee320b259b8f8b9683c11a0ba19b47b006a44
author Colin Cross <ccross@android.com> Thu Oct 19 23:38:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 19 23:38:09 2017 +0000
tree 6a5f27f4b8c3d32913837c0f8154ed2b9a232087
parent d8f5ef2a697d12c94b16a3059006f6b34590b938
parent a64eaf9023ac0c2f788ecd9ca138b003207b0760

Merge "Revert "Revert "Add static version of dexdump2"""
am: a64eaf9023

Change-Id: Ic5c223976942ec069c5f5db1f1de6ec43f408b3f

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 7f2f789..8d84da6 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -513,6 +513,10 @@
   UNUSED(old_value);
 #endif
 
+#ifdef ART_TARGET_ANDROID
+  android_set_abort_message(msg);
+#endif
+
   // Ensure that we don't have multiple threads trying to abort at once,
   // which would result in significantly worse diagnostics.
   MutexLock mu(Thread::Current(), *Locks::abort_lock_);