diff options
author | Tomasz Wasilczyk | 2018-07-31 13:16:55 -0500 |
---|---|---|
committer | Tomasz Wasilczyk | 2018-07-31 18:33:38 -0500 |
commit | 3b70eedfa047e3d4d4370caabdcff7ca267a6568 (patch) | |
tree | 4bb5e6e03feedac850a21a0791605139e5ab7ae7 | |
parent | 28fb130cbbd7c01ef706d5b6a5a9877b290f275c (diff) | |
download | platform-system-core-3b70eedfa047e3d4d4370caabdcff7ca267a6568.tar.gz platform-system-core-3b70eedfa047e3d4d4370caabdcff7ca267a6568.tar.xz platform-system-core-3b70eedfa047e3d4d4370caabdcff7ca267a6568.zip |
Remove unused logging symbols.
Bug: 35361699
Test: flash sailfish, it boots
Change-Id: Ie545145789faa299e1228b6c91566e0767f7ea79
-rw-r--r-- | base/include/android-base/logging.h | 5 | ||||
-rw-r--r-- | base/logging.cpp | 9 |
2 files changed, 0 insertions, 14 deletions
diff --git a/base/include/android-base/logging.h b/base/include/android-base/logging.h index aea6ce601..f94cc258e 100644 --- a/base/include/android-base/logging.h +++ b/base/include/android-base/logging.h | |||
@@ -447,11 +447,6 @@ class LogMessage { | |||
447 | private: | 447 | private: |
448 | const std::unique_ptr<LogMessageData> data_; | 448 | const std::unique_ptr<LogMessageData> data_; |
449 | 449 | ||
450 | // TODO(b/35361699): remove these symbols once all prebuilds stop using it. | ||
451 | LogMessage(const char* file, unsigned int line, LogId id, LogSeverity severity, int error); | ||
452 | static void LogLine(const char* file, unsigned int line, LogId id, LogSeverity severity, | ||
453 | const char* msg); | ||
454 | |||
455 | DISALLOW_COPY_AND_ASSIGN(LogMessage); | 450 | DISALLOW_COPY_AND_ASSIGN(LogMessage); |
456 | }; | 451 | }; |
457 | 452 | ||
diff --git a/base/logging.cpp b/base/logging.cpp index 35054ac82..d60d91d5d 100644 --- a/base/logging.cpp +++ b/base/logging.cpp | |||
@@ -410,10 +410,6 @@ LogMessage::LogMessage(const char* file, unsigned int line, LogId id, LogSeverit | |||
410 | const char* tag, int error) | 410 | const char* tag, int error) |
411 | : data_(new LogMessageData(file, line, id, severity, tag, error)) {} | 411 | : data_(new LogMessageData(file, line, id, severity, tag, error)) {} |
412 | 412 | ||
413 | LogMessage::LogMessage(const char* file, unsigned int line, LogId id, LogSeverity severity, | ||
414 | int error) | ||
415 | : LogMessage(file, line, id, severity, nullptr, error) {} | ||
416 | |||
417 | LogMessage::~LogMessage() { | 413 | LogMessage::~LogMessage() { |
418 | // Check severity again. This is duplicate work wrt/ LOG macros, but not LOG_STREAM. | 414 | // Check severity again. This is duplicate work wrt/ LOG macros, but not LOG_STREAM. |
419 | if (!WOULD_LOG(data_->GetSeverity())) { | 415 | if (!WOULD_LOG(data_->GetSeverity())) { |
@@ -470,11 +466,6 @@ void LogMessage::LogLine(const char* file, unsigned int line, LogId id, LogSever | |||
470 | } | 466 | } |
471 | } | 467 | } |
472 | 468 | ||
473 | void LogMessage::LogLine(const char* file, unsigned int line, LogId id, LogSeverity severity, | ||
474 | const char* message) { | ||
475 | LogLine(file, line, id, severity, nullptr, message); | ||
476 | } | ||
477 | |||
478 | LogSeverity GetMinimumLogSeverity() { | 469 | LogSeverity GetMinimumLogSeverity() { |
479 | return gMinimumLogSeverity; | 470 | return gMinimumLogSeverity; |
480 | } | 471 | } |