diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2017-04-06 12:01:46 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2017-06-12 09:41:00 +0800 |
| commit | 3889bbdce23ff216af4400dd3c9703277c79b91e (patch) | |
| tree | 4c33ebab14645293e13cef482bba4dc4d751d725 | |
| parent | bf0f92c1e8efb772f9e3ba5718378d3710c6cecd (diff) | |
| download | libva-3889bbdce23ff216af4400dd3c9703277c79b91e.tar.gz | |
android: simplify Android logging
To support older versions, just check if ALOGx are defined.
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
(cherry picked from commit 340d99b62600c1f86eabdefbfa778559d5ac5a7c)
| -rwxr-xr-x | va/Android.mk | 12 | ||||
| -rw-r--r-- | va/va.c | 18 |
2 files changed, 12 insertions, 18 deletions
diff --git a/va/Android.mk b/va/Android.mk index bf3a969..fba41fa 100755 --- a/va/Android.mk +++ b/va/Android.mk @@ -28,11 +28,6 @@ LOCAL_PATH:= $(call my-dir) LIBVA_DRIVERS_PATH_32 = /system/lib LIBVA_DRIVERS_PATH_64 = /system/lib64 -# Version set to Android Jelly Bean -ALOG_VERSION_REQ := 4.1 -ALOG_VERSION := $(filter $(ALOG_VERSION_REQ),$(firstword $(sort $(PLATFORM_VERSION) \ - $(ALOG_VERSION_REQ)))) - include $(CLEAR_VARS) #LIBVA_MINOR_VERSION := 31 @@ -51,13 +46,6 @@ LOCAL_CFLAGS_64 += \ -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_64)\"" \ -DLOG_TAG=\"libva\" -# Android Jelly Bean defined ALOGx, older versions use LOGx -ifeq ($(ALOG_VERSION), $(ALOG_VERSION_REQ)) -LOCAL_CFLAGS += -DANDROID_ALOG -else -LOCAL_CFLAGS += -DANDROID_LOG -endif - LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_MODULE_TAGS := optional @@ -37,6 +37,16 @@ #include <string.h> #include <dlfcn.h> #include <unistd.h> +#ifdef ANDROID +#include <cutils/log.h> +/* support versions < JellyBean */ +#ifndef ALOGE +#define ALOGE LOGE +#endif +#ifndef ALOGI +#define ALOGI LOGI +#endif +#endif #define DRIVER_EXTENSION "_drv_video.so" @@ -108,10 +118,8 @@ int vaDisplayIsValid(VADisplay dpy) static void default_log_error(const char *buffer) { -# ifdef ANDROID_ALOG +# ifdef ANDROID ALOGE("%s", buffer); -# elif ANDROID_LOG - LOGE("%s", buffer); # else fprintf(stderr, "libva error: %s", buffer); # endif @@ -119,10 +127,8 @@ static void default_log_error(const char *buffer) static void default_log_info(const char *buffer) { -# ifdef ANDROID_ALOG +# ifdef ANDROID ALOGI("%s", buffer); -# elif ANDROID_LOG - LOGI("%s", buffer); # else fprintf(stderr, "libva info: %s", buffer); # endif |