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

Commit 3b70eedf authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Remove unused logging symbols. 

Bug: 35361699
Test: flash sailfish, it boots
Change-Id: Ie545145789faa299e1228b6c91566e0767f7ea79
parent 28fb130c

base/include/android-base/logging.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -447,11 +447,6 @@ class LogMessage { 
 private:

 private:

  const std::unique_ptr<LogMessageData> data_;

  const std::unique_ptr<LogMessageData> data_;





  // TODO(b/35361699): remove these symbols once all prebuilds stop using it.

  LogMessage(const char* file, unsigned int line, LogId id, LogSeverity severity, int error);

  static void LogLine(const char* file, unsigned int line, LogId id, LogSeverity severity,

                      const char* msg);



  DISALLOW_COPY_AND_ASSIGN(LogMessage);

  DISALLOW_COPY_AND_ASSIGN(LogMessage);

};

};

base/logging.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -410,10 +410,6 @@ LogMessage::LogMessage(const char* file, unsigned int line, LogId id, LogSeverit 
                       const char* tag, int error)

                       const char* tag, int error)

    : data_(new LogMessageData(file, line, id, severity, tag, error)) {}

    : data_(new LogMessageData(file, line, id, severity, tag, error)) {}





LogMessage::LogMessage(const char* file, unsigned int line, LogId id, LogSeverity severity,

                       int error)

    : LogMessage(file, line, id, severity, nullptr, error) {}



LogMessage::~LogMessage() {

LogMessage::~LogMessage() {

  // Check severity again. This is duplicate work wrt/ LOG macros, but not LOG_STREAM.

  // Check severity again. This is duplicate work wrt/ LOG macros, but not LOG_STREAM.

  if (!WOULD_LOG(data_->GetSeverity())) {

  if (!WOULD_LOG(data_->GetSeverity())) {
@@ -470,11 +466,6 @@ void LogMessage::LogLine(const char* file, unsigned int line, LogId id, LogSever 
  }

  }

}

}





void LogMessage::LogLine(const char* file, unsigned int line, LogId id, LogSeverity severity,

                         const char* message) {

  LogLine(file, line, id, severity, nullptr, message);

}



LogSeverity GetMinimumLogSeverity() {

LogSeverity GetMinimumLogSeverity() {

    return gMinimumLogSeverity;

    return gMinimumLogSeverity;

}

}