commit 1da65e7bbc47bd55fb49087bfd22ca9e558a5d0d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 13 23:57:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 13 23:57:30 2020 +0000
tree 2bbca719c2ae8035a9c2c58569ce6505ea9160c6
parent 8e35e17e48d6abb8060f9bafa008d4beecada2c3
parent 295f4677eec49a4dd0c3d58a66ca6e6dc363baf7

Merge "liblog: move LOG_ID_DEFAULT into the log_id enum" into rvc-dev

liblog/include/android/log.h

diff --git a/liblog/include/android/log.h b/liblog/include/android/log.h
index 4ce8038..43a91ab 100644
--- a/liblog/include/android/log.h
+++ b/liblog/include/android/log.h
@@ -204,7 +204,7 @@
  */
 typedef void (*__android_aborter_function)(const char* abort_message);
 
-#if __ANDROID_API__ >= 30 || !defined(__ANDROID__)
+#if !defined(__ANDROID__) || __ANDROID_API__ >= 30
 /**
  * Writes the log message specified with logger_data and msg to the log.  logger_data includes
  * additional file name and line number information that a logger may use.  logger_data is versioned