summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2017-06-23 17:54:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-23 17:54:28 +0000
commit4f247ab19affe2df1bd64526b51de5c169dba44a (patch)
tree043adfae800954f3eddded9f53c6d284749f55ef
parentdbf737a0d087f71ebbeb5f12ed8656cf14d85cb0 (diff)
parent0ffbe5f14b14e84585a75ababd4864c187afae04 (diff)
ART: Refactor abort code
am: 0ffbe5f14b Change-Id: I21c10d568840278905901d4e5cb6f6447b4dc483
-rw-r--r--runtime/runtime.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 46b4392ef42..eb6826d15bb 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -494,6 +494,10 @@ void Runtime::Abort(const char* msg) {
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_);