From ce6b1abbb1da797e716d8ec03da4e3b6304fd11d Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 18 Aug 2014 14:37:42 -0700 Subject: [PATCH] Expose android_set_abort_message(). Removes the leading underscores from __android_set_abort_message() and moves its declaration into a public header file. Bug: 17059126 Change-Id: I470c79db47ec783ea7a54b800f8b78ecbe7479ab --- libc/bionic/libc_logging.cpp | 5 ++-- libc/include/android/set_abort_message.h | 38 ++++++++++++++++++++++++ libc/private/libc_logging.h | 2 -- 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 libc/include/android/set_abort_message.h diff --git a/libc/bionic/libc_logging.cpp b/libc/bionic/libc_logging.cpp index d0172edaa..565552665 100644 --- a/libc/bionic/libc_logging.cpp +++ b/libc/bionic/libc_logging.cpp @@ -29,6 +29,7 @@ #include "../private/libc_logging.h" // Relative path so we can #include this .cpp file for testing. #include "../private/ScopedPthreadMutexLocker.h" +#include #include #include #include @@ -629,7 +630,7 @@ static void __libc_fatal(const char* format, va_list args) { // Log to the log for the benefit of regular app developers (whose stdout and stderr are closed). __libc_write_log(ANDROID_LOG_FATAL, "libc", msg); - __android_set_abort_message(msg); + android_set_abort_message(msg); } void __libc_fatal_no_abort(const char* format, ...) { @@ -647,7 +648,7 @@ void __libc_fatal(const char* format, ...) { abort(); } -void __android_set_abort_message(const char* msg) { +void android_set_abort_message(const char* msg) { ScopedPthreadMutexLocker locker(&g_abort_msg_lock); if (__abort_message_ptr == NULL) { diff --git a/libc/include/android/set_abort_message.h b/libc/include/android/set_abort_message.h new file mode 100644 index 000000000..3e6da1f50 --- /dev/null +++ b/libc/include/android/set_abort_message.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SET_ABORT_MESSAGE_H +#define _SET_ABORT_MESSAGE_H + +__BEGIN_DECLS + +void android_set_abort_message(const char* msg); + +__END_DECLS + +#endif // _SET_ABORT_MESSAGE_H diff --git a/libc/private/libc_logging.h b/libc/private/libc_logging.h index 35c756bb9..da2192bba 100644 --- a/libc/private/libc_logging.h +++ b/libc/private/libc_logging.h @@ -69,8 +69,6 @@ struct abort_msg_t { char msg[0]; }; -void __android_set_abort_message(const char* msg); - // // Formats a message to the log (priority 'fatal'), then aborts. //