commit 7021287e6b34cf6d697f4a6f78fa6bd711afc590
author Andreas Gampe <agampe@google.com> Wed Sep 13 02:53:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 13 02:53:58 2017 +0000
tree f3089c61b5b1c736e5d1a30b2d7fc3fbcf370308
parent 97256b4205607fdd067663b48540e141c7f9f69a
parent 89c2f5edb096a82b5271b4671f40e4608a6cb14e

Merge "ART: Clear JniConstants on shutdown"
am: 89c2f5edb0

Change-Id: I9294113aa08b76adac5fca8176d9b1263976ca64

runtime/runtime.cc

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