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

Commit d40cb2ae authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Fix logd's implicit dependency on libsysutils." am: ad0614b8 

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

Change-Id: I94e78d01b18030942b5c3c84cdf06646afb93fd5
parents 69988944 ad0614b8

logd/ChattyLogBuffer.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <android-base/thread_annotations.h>

#include <android/log.h>

#include <private/android_filesystem_config.h>

#include <sysutils/SocketClient.h>



#include "LogBuffer.h"

#include "LogBufferElement.h"

logd/LogReader.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include "LogReaderList.h"

#include "LogReaderThread.h"



#define LOGD_SNDTIMEO 32



class LogReader : public SocketListener {

  public:

    explicit LogReader(LogBuffer* logbuf, LogReaderList* reader_list);

logd/LogReaderThread.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <memory>



#include <log/log.h>

#include <sysutils/SocketClient.h>



#include "LogBuffer.h"

#include "LogWriter.h"

logd/LogTags.cpp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <sys/mman.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <sys/uio.h>

#include <unistd.h>



#include <string>

logd/LogUtils.h

+2 −1
Original line number Diff line number Diff line
@@ -20,12 +20,13 @@ 
#include <sys/types.h>



#include <private/android_logger.h>

#include <sysutils/SocketClient.h>

#include <utils/FastStrcmp.h>



// Hijack this header as a common include file used by most all sources

// to report some utilities defined here and there.



#define LOGD_SNDTIMEO 32



namespace android {



// Furnished in main.cpp. Caller must own and free returned value