| Index: runtime/platform/assert_android.cc
|
| diff --git a/runtime/platform/assert.cc b/runtime/platform/assert_android.cc
|
| similarity index 96%
|
| copy from runtime/platform/assert.cc
|
| copy to runtime/platform/assert_android.cc
|
| index 2ea934965eb53437d05705ac9f73987982c421b9..bb91bfb5d6b4825faf8593e2c8583f65f2bb674d 100644
|
| --- a/runtime/platform/assert.cc
|
| +++ b/runtime/platform/assert_android.cc
|
| @@ -38,11 +38,11 @@ void DynamicAssertionHelper::Fail(const char* format, ...) {
|
| // TODO(5411324): replace std::abort with OS::Abort so that we can handle
|
| // restoring of signal handlers before aborting.
|
| if (kind_ == ASSERT) {
|
| - std::abort();
|
| + abort();
|
| }
|
| static bool failed = false;
|
| if (!failed) {
|
| - std::atexit(&failed_exit);
|
| + atexit(&failed_exit);
|
| }
|
| failed = true;
|
| }
|
|
|