Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c4b3946 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libutils: use log/log.h internally" into main am: cd9556cb am:... 

Merge "libutils: use log/log.h internally" into main am: cd9556cb am: 9debc02c am: 28ca4e11 am: 982aa049

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2777584



Change-Id: I50d626c7220ba2cfbd07f704f812ecca5ff1e37f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7aafe56a 982aa049

libutils/CallStack.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 




#include <utils/Printer.h>

#include <utils/Printer.h>

#include <utils/Errors.h>

#include <utils/Errors.h>

#include <utils/Log.h>

#include <log/log.h>





#include <unwindstack/AndroidUnwinder.h>

#include <unwindstack/AndroidUnwinder.h>

libutils/FileMap.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
#define LOG_TAG "filemap"

#define LOG_TAG "filemap"





#include <utils/FileMap.h>

#include <utils/FileMap.h>

#include <utils/Log.h>

#include <log/log.h>





#if defined(__MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO)

#if defined(__MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO)

# define PRId32 "I32d"

# define PRId32 "I32d"

libutils/Printer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 




#include <utils/Printer.h>

#include <utils/Printer.h>

#include <utils/String8.h>

#include <utils/String8.h>

#include <utils/Log.h>

#include <log/log.h>





#include <stdlib.h>

#include <stdlib.h>

libutils/RefBase_fuzz.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <thread>

#include <thread>





#include "fuzzer/FuzzedDataProvider.h"

#include "fuzzer/FuzzedDataProvider.h"

#include "utils/Log.h"

#include "log/log.h"

#include "utils/RWLock.h"

#include "utils/RWLock.h"

#include "utils/RefBase.h"

#include "utils/RefBase.h"

#include "utils/StrongPointer.h"

#include "utils/StrongPointer.h"

libutils/StopWatch.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
#endif

#endif

#include <inttypes.h>

#include <inttypes.h>





#include <utils/Log.h>

#include <log/log.h>





namespace android {

namespace android {