commit 8e35e17e48d6abb8060f9bafa008d4beecada2c3
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 13 23:46:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 13 23:46:52 2020 +0000
tree fd662e1314a44ecac0bd1b03214efa47e2860b8d
parent 3d705a3432a59517de1a3546c9db87ba31f6ed0a
parent 090c83aa38dd683c769cbf3bef87ae04679610bf

Merge "liblog: fix header guards ordering" into rvc-dev

liblog/include/android/log.h

diff --git a/liblog/include/android/log.h b/liblog/include/android/log.h
index b3324a3..ff6654c 100644
--- a/liblog/include/android/log.h
+++ b/liblog/include/android/log.h
@@ -207,7 +207,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