commit 720aec1cd6ebf4c4d74326c5faaddd57ee351609
author Merck Hung <merckhung@google.com> Sat Sep 29 05:21:57 2018 +0800
committer Merck Hung <merckhung@google.com> Tue Oct 02 14:09:36 2018 +0000
tree cb5ff5adc6fd9c0196e14b0ab381959a4c1ea038
parent a5dfd97d8264bb67835910060326f3edb22b021b

Migrate to using <log/log.h> since Android O (API 27)

Starting from Android O, <cutils/log.h> is planned to be deprecated in the
future. The use of the original <cutils/log.h> is split into 2 header files.

Per Treble team's (b/78370064) description, <log/log.h> is for native shared
libs or executables, and <android/log.h> is for app JNI.

So a conditional preprocessor is put in place to look at the
ANDROID_PLATFORM_SDK_VERSION definition. If the value is less than 27, means
it's Android N or older, and it ought to include <cutils/log.h>.

Otherwise, it should be 27 (Android O) or any greater version, and it's
supposed to include the new <log/log.h> file.

If ANDROID_PLATFORM_SDK_VERSION is not definied, Andorid build system catches
it and stops the building process with an error message.

Bug: b/116855807
Test: pi-dev(28), oc-mr1-dev(27), and nyc-mr2-dev(26) branches
Test: aosp_arm-eng target
Change-Id: I732803e900144bf291feeb2cba1d632301c4fa21
Reviewed-on: https://swiftshader-review.googlesource.com/21130
Tested-by: Merck Hung <merckhung@google.com>
Reviewed-by: Merck Hung <merckhung@google.com>
Reviewed-by: Alistair Strachan <astrachan@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Common/DebugAndroid.hpp

diff --git a/src/Common/DebugAndroid.hpp b/src/Common/DebugAndroid.hpp
index f5ce468..eced194 100644
--- a/src/Common/DebugAndroid.hpp
+++ b/src/Common/DebugAndroid.hpp
@@ -15,7 +15,14 @@
 #ifndef DebugAndroid_hpp
 #define DebugAndroid_hpp
 
+#if ANDROID_PLATFORM_SDK_VERSION < 27
 #include <cutils/log.h>
+#elif ANDROID_PLATFORM_SDK_VERSION >= 27
+#include <log/log.h>
+#else
+#error "ANDROID_PLATFORM_SDK_VERSION is not defined"
+#endif
+
 #include <cassert>
 
 // On Android Virtual Devices we heavily depend on logging, even in

src/OpenGL/common/debug.cpp

diff --git a/src/OpenGL/common/debug.cpp b/src/OpenGL/common/debug.cpp
index 9303260..8881076 100644
--- a/src/OpenGL/common/debug.cpp
+++ b/src/OpenGL/common/debug.cpp
@@ -18,7 +18,13 @@
 
 #ifdef  __ANDROID__
 #include <utils/String8.h>
+#if ANDROID_PLATFORM_SDK_VERSION < 27
 #include <cutils/log.h>
+#elif ANDROID_PLATFORM_SDK_VERSION >= 27
+#include <log/log.h>
+#else
+#error "ANDROID_PLATFORM_SDK_VERSION is not defined"
+#endif
 #endif
 
 #include <stdio.h>