Merge "Remove unused logging symbols."

StyxProject-Next · Aug 1, 2018 · 081b710 · 081b710
2 parents 52126a4 + 3b70eed
commit 081b710
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/base/include/android-base/logging.h b/base/include/android-base/logging.h
@@ -447,11 +447,6 @@ class LogMessage {
  private:
   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);
 };
 

diff --git a/base/logging.cpp b/base/logging.cpp
@@ -410,10 +410,6 @@ LogMessage::LogMessage(const char* file, unsigned int line, LogId id, LogSeverit
                        const char* tag, int 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() {
   // Check severity again. This is duplicate work wrt/ LOG macros, but not LOG_STREAM.
   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() {
     return gMinimumLogSeverity;
 }