commit 380c34dd4b3d34a0db3dbb87a398df1ccedff651
author Merck Hung <merckhung@google.com> Tue Oct 16 09:08:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 16 09:08:16 2018 -0700
tree 0e84699f979db4c490ece1d13ac78636bcbcf543
parent 804923506b6b0ce0bcb58c94a4a17100c1188a03
parent 8c5babe32c86df32bb006e476bbdfdf57f9a2225

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

Change-Id: I7e8d37e2a547a6e85d6860e088f6514719fbf058

src/Common/DebugAndroid.hpp

diff --git a/src/Common/DebugAndroid.hpp b/src/Common/DebugAndroid.hpp
index 6dfb61d..a376adc 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 3ef2885..589f905 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>