From b9a0e2ad60ea4f96399c57f4c7035ea96345944b Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Thu, 5 Mar 2020 10:00:52 -0800 Subject: [PATCH] base: access all new liblog symbols through liblog_functions The original CL was missing these. Bug: 149591522 Test: build Merged-In: I99615b81cfe9166a00c812a8642ecf1244bf08b9 Change-Id: I99615b81cfe9166a00c812a8642ecf1244bf08b9 (cherry picked from commit d620ec7fb97e0036dd37be23cc94745e80ef51fa) --- base/logging.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/logging.cpp b/base/logging.cpp index f42b9966b..9360a56d5 100644 --- a/base/logging.cpp +++ b/base/logging.cpp @@ -447,7 +447,7 @@ void SetAborter(AbortFunction&& aborter) { // See the comment in SetLogger(). static std::atomic abort_function(nullptr); auto* old_abort_function = abort_function.exchange(new AbortFunction(aborter)); - __android_log_set_aborter([](const char* abort_message) { + liblog_functions->__android_log_set_aborter([](const char* abort_message) { auto& function = *abort_function.load(std::memory_order_acquire); function(abort_message); }); @@ -578,7 +578,7 @@ void LogMessage::LogLine(const char* file, unsigned int line, LogSeverity severi if (liblog_functions) { __android_logger_data logger_data = { sizeof(__android_logger_data), LOG_ID_DEFAULT, priority, tag, file, line}; - __android_log_write_logger_data(&logger_data, message); + liblog_functions->__android_log_write_logger_data(&logger_data, message); } else { if (tag == nullptr) { std::lock_guard lock(TagLock());