commit cd613769867570f86a8a89de0e24ef3fa334dd09
author Tom Cherry <tomcherry@google.com> Fri Mar 13 15:48:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 13 15:48:19 2020 +0000
tree a75562c82c2aadce1c12f8892b95b088fbfa9c76
parent 4fe694a9c190c332aa863f6aa762b6c21661eab3
parent 227ac5645450bca279735a2a0dbba77c24f5fbb4

Merge "liblog: fix header guards ordering"

liblog/include/android/log.h

diff --git a/liblog/include/android/log.h b/liblog/include/android/log.h
index 15c7963..bb5c092 100644
--- a/liblog/include/android/log.h
+++ b/liblog/include/android/log.h
@@ -206,7 +206,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