Patch copied from: https://android.googlesource.com/platform/system/core/+/e5dd71a290f664d3f3bf0dd8a4bad411dc7ad416 From e5dd71a290f664d3f3bf0dd8a4bad411dc7ad416 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 28 Jul 2016 15:15:28 -0700 Subject: [PATCH] libbase should use its own logging! Not doing so led to us using a bogus log tag. Bug: http://b/30281203 Change-Id: I3ac91758a1a043146c65f2ae0f36fcfbe372c30f --- base/file.cpp | 11 +++++------ base/logging.cpp | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/base/file.cpp b/base/file.cpp index da1adba19..4e7ac82d1 100644 --- a/base/file.cpp +++ b/base/file.cpp @@ -24,9 +24,8 @@ #include #include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin. +#include "android-base/logging.h" #include "android-base/utf8.h" -#define LOG_TAG "base.file" -#include "cutils/log.h" #include "utils/Compat.h" namespace android { @@ -86,22 +85,22 @@ bool WriteStringToFile(const std::string& content, const std::string& path, int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW | O_BINARY; int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, mode)); if (fd == -1) { - ALOGE("android::WriteStringToFile open failed: %s", strerror(errno)); + PLOG(ERROR) << "android::WriteStringToFile open failed"; return false; } // We do an explicit fchmod here because we assume that the caller really // meant what they said and doesn't want the umask-influenced mode. if (fchmod(fd, mode) == -1) { - ALOGE("android::WriteStringToFile fchmod failed: %s", strerror(errno)); + PLOG(ERROR) << "android::WriteStringToFile fchmod failed"; return CleanUpAfterFailedWrite(path); } if (fchown(fd, owner, group) == -1) { - ALOGE("android::WriteStringToFile fchown failed: %s", strerror(errno)); + PLOG(ERROR) << "android::WriteStringToFile fchown failed"; return CleanUpAfterFailedWrite(path); } if (!WriteStringToFd(content, fd)) { - ALOGE("android::WriteStringToFile write failed: %s", strerror(errno)); + PLOG(ERROR) << "android::WriteStringToFile write failed"; return CleanUpAfterFailedWrite(path); } close(fd); diff --git a/base/logging.cpp b/base/logging.cpp index 769c266c9..959bb8b05 100644 --- a/base/logging.cpp +++ b/base/logging.cpp @@ -43,12 +43,11 @@ #include "android-base/macros.h" #include "android-base/strings.h" -#include "cutils/threads.h" // Headers for LogMessage::LogLine. #ifdef __ANDROID__ #include -#include "cutils/log.h" +#include "log/log.h" #else #include #include -- 2.11.0 vices: Update setuid service description....Tobias Geerinckx-Rice 2022-05-18services: Make <service-type> 'description' field mandatory....Ludovic Courtès 2022-05-18services: Add more description fields....Ludovic Courtès 2022-03-10services: startup: Add description....Ludovic Courtès 2021-11-27services: Document the 'delete' clause of 'modify-services'....Ludovic Courtès 2021-08-12system: Handle 'setuid-programs' deprecation handling as a field sanitizer....Ludovic Courtès 2021-07-29services: setuid: More configurable setuid support....Chris Lemmer-Webber 2021-05-11gnu: Allow services to install kernel-loadable modules....raid5atemyhomework 2021-04-12services: Support DELETE in MODIFY-SERVICES macro....Ricardo Wurmus 2021-03-09gnu: services: Add activate script to the profile system directory....Brice Waegeneire 2020-12-01services: profile: Create manifest at monadic-bind time....Ludovic Courtès 2020-10-16services: provenance: Wrap config file name in 'assume-valid-file-name'....Ludovic Courtès