From ff7521c9bac3d52f645c68deac7084e20b81b2f5 Mon Sep 17 00:00:00 2001 From: "jenny.q.cao" Date: Fri, 27 Apr 2018 10:11:36 +0800 Subject: [PATCH] android: change include "cutils/log.h" to "log/log.h" on Android API >=26 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit There is a compile warning from Android 8 (API version 26) from "include cutils/log.h" warning: "Deprecated: don't include cutils/log.h, use either android/log.h or log/log.h"-W#warnings, Change to include "log/log.h" on Android 8 or later major version to avoid this warning Signed-off-by: jenny.q.cao Reviewed-by: Tapani Pälli --- src/broadcom/common/v3d_debug.h | 4 ++++ src/egl/main/egllog.c | 4 ++++ src/intel/common/gen_debug.h | 4 ++++ src/mesa/drivers/dri/i915/intel_context.h | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/src/broadcom/common/v3d_debug.h b/src/broadcom/common/v3d_debug.h index bdb9518548c..75eb2718f30 100644 --- a/src/broadcom/common/v3d_debug.h +++ b/src/broadcom/common/v3d_debug.h @@ -57,7 +57,11 @@ extern uint32_t V3D_DEBUG; #ifdef HAVE_ANDROID_PLATFORM #define LOG_TAG "BROADCOM-MESA" +#if ANDROID_API_LEVEL >= 26 +#include +#else #include +#endif /* use log/log.h start from android 8 major version */ #ifndef ALOGW #define ALOGW LOGW #endif diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c index 64ff474c65c..c223f49b0fe 100644 --- a/src/egl/main/egllog.c +++ b/src/egl/main/egllog.c @@ -47,7 +47,11 @@ #ifdef HAVE_ANDROID_PLATFORM #define LOG_TAG "EGL-MAIN" +#if ANDROID_API_LEVEL >= 26 +#include +#else #include +#endif /* use log/log.h start from android 8 major version */ #endif /* HAVE_ANDROID_PLATFORM */ diff --git a/src/intel/common/gen_debug.h b/src/intel/common/gen_debug.h index da5b5a569d1..f6c44eeb912 100644 --- a/src/intel/common/gen_debug.h +++ b/src/intel/common/gen_debug.h @@ -86,7 +86,11 @@ extern uint64_t INTEL_DEBUG; #ifdef HAVE_ANDROID_PLATFORM #define LOG_TAG "INTEL-MESA" +#if ANDROID_API_LEVEL >= 26 +#include +#else #include +#endif /* use log/log.h start from android 8 major version */ #ifndef ALOGW #define ALOGW LOGW #endif diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index a219c7fb1dc..a8339896f65 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -284,7 +284,11 @@ extern int INTEL_DEBUG; #ifdef HAVE_ANDROID_PLATFORM #define LOG_TAG "INTEL-MESA" +#if ANDROID_API_LEVEL >= 26 +#include +#else #include +#endif /* use log/log.h start from android 8 major version */ #ifndef ALOGW #define ALOGW LOGW #endif -- 2.30.2