commit 628f48871a9c7a1f18c2d5e1a76aa7afc716810d
author Tom Cherry <tomcherry@google.com> Fri Jan 10 17:36:14 2020 -0800
committer Tom Cherry <tomcherry@google.com> Tue Jan 14 22:16:55 2020 +0000
tree 5fb203100260313a76748c8b0ef9ff91b549a725
parent 9406c43b2de9b94b6d70f82474840eccd7699dc7

Remove the LogId parameter from libbase's LogMessage

This isn't used by anyone and shouldn't have existed in the first
place, so it's being removed.

Test: build
Change-Id: Ifb0a1180a176291085cab01fd8e267184ea23cf1

libartbase/base/logging.h

diff --git a/libartbase/base/logging.h b/libartbase/base/logging.h
index f9de355..e573f03 100644
--- a/libartbase/base/logging.h
+++ b/libartbase/base/logging.h
@@ -117,13 +117,12 @@
   VlogMessage(bool enable,
               const char* file,
               unsigned int line,
-              ::android::base::LogId id,
               ::android::base::LogSeverity severity,
               const char* tag,
               int error)
       : msg_(std::in_place_type<std::ostringstream>) {
     if (enable) {
-      msg_.emplace<::android::base::LogMessage>(file, line, id, severity, tag, error);
+      msg_.emplace<::android::base::LogMessage>(file, line, severity, tag, error);
     }
   }
 
@@ -145,7 +144,6 @@
   ::art::VlogMessage(VLOG_IS_ON(module),       \
                      __FILE__,                 \
                      __LINE__,                 \
-                     ::android::base::DEFAULT, \
                      ::android::base::INFO,    \
                      _LOG_TAG_INTERNAL,        \
                      -1)                       \

openjdkjvmti/ti_logging.h

diff --git a/openjdkjvmti/ti_logging.h b/openjdkjvmti/ti_logging.h
index a1be090..b4ce5b6 100644
--- a/openjdkjvmti/ti_logging.h
+++ b/openjdkjvmti/ti_logging.h
@@ -50,7 +50,6 @@
   ::openjdkjvmti::JvmtiLogMessage((env),                     \
                                   __FILE__,                  \
                                   __LINE__,                  \
-                                  ::android::base::DEFAULT,  \
                                   SEVERITY_LAMBDA(severity), \
                                   _LOG_TAG_INTERNAL,         \
                                   -1)
@@ -60,12 +59,11 @@
   JvmtiLogMessage(jvmtiEnv* env,
                   const char* file,
                   unsigned int line,
-                  android::base::LogId id,
                   android::base::LogSeverity severity,
                   const char* tag,
                   int error)
       : env_(ArtJvmTiEnv::AsArtJvmTiEnv(env)),
-        real_log_(file, line, id, severity, tag, error),
+        real_log_(file, line, severity, tag, error),
         real_log_stream_(real_log_.stream()) {
     DCHECK(env_ != nullptr);
   }