commit 4701cbda2527762cd301a0b09910a0e21277b1c4
author Orion Hodson <oth@google.com> Sun Oct 15 01:43:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Oct 15 01:43:57 2017 +0000
tree 20b8d1da46e19acbf3465b9c7334699de162c823
parent 549fe2a9c0823b7e023152b58b105e6ebb702541
parent 445e0ec3724b7f4f36bbd218f67a2c9bfbea7669

Merge "ART: clean-up 959-invoke-polymorphic-accessors"
am: 445e0ec372

Change-Id: Ib567c0522a6f906bdc85004ac89f1167e0d82bf8

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index a4ed21e..d507758 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -508,6 +508,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_);