sdm: Use generic libdebug utility.
CRs-Fixed: 2211061
Change-Id: Ib949c40ff63a61a4476876c45357a40a702c9a01
diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk
index ebcfc8a..97c052b 100644
--- a/libdrmutils/Android.mk
+++ b/libdrmutils/Android.mk
@@ -6,7 +6,8 @@
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := external/libdrm \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_SHARED_LIBRARIES := libdrm libdl
+LOCAL_HEADER_LIBRARIES := display_headers
+LOCAL_SHARED_LIBRARIES := libdrm libdl libdisplaydebug
LOCAL_CFLAGS := -DLOG_TAG=\"DRMUTILS\" -Wall -std=c++11 -Werror -fno-operator-names
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
diff --git a/libdrmutils/drm_logger.h b/libdrmutils/drm_logger.h
index 8e8bb72..7f81d88 100644
--- a/libdrmutils/drm_logger.h
+++ b/libdrmutils/drm_logger.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2017, The Linux Foundation. All rights reserved.
+* Copyright (c) 2017 - 2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,39 +30,18 @@
#ifndef __DRM_LOGGER_H__
#define __DRM_LOGGER_H__
+#include <debug_handler.h>
#include <utility>
namespace drm_utils {
-class DRMLogger {
- public:
- virtual ~DRMLogger() {}
- virtual void Error(const char *format, ...) = 0;
- virtual void Warning(const char *format, ...) = 0;
- virtual void Info(const char *format, ...) = 0;
- virtual void Debug(const char *format, ...) = 0;
- virtual void Verbose(const char *format, ...) = 0;
+#define DRM_LOG_TAG 4 // = kTagRotator
- static void Set(DRMLogger *logger) { s_instance = logger; }
- static DRMLogger *Get() { return s_instance; }
-
- private:
- static DRMLogger *s_instance;
-};
-
-#define DRM_LOG(method, format, ...) \
- if (drm_utils::DRMLogger::Get()) { \
- drm_utils::DRMLogger::Get()->method(format, ##__VA_ARGS__); \
- }
-
-#define DRM_LOG_CONTEXT(method, format, ...) \
- DRM_LOG(method, __CLASS__ "::%s: " format, __FUNCTION__, ##__VA_ARGS__);
-
-#define DRM_LOGE(format, ...) DRM_LOG_CONTEXT(Error, format, ##__VA_ARGS__)
-#define DRM_LOGW(format, ...) DRM_LOG_CONTEXT(Warning, format, ##__VA_ARGS__)
-#define DRM_LOGI(format, ...) DRM_LOG_CONTEXT(Info, format, ##__VA_ARGS__)
-#define DRM_LOGD(format, ...) DRM_LOG_CONTEXT(Debug, format, ##__VA_ARGS__)
-#define DRM_LOGV(format, ...) DRM_LOG_CONTEXT(Verbose, format, ##__VA_ARGS__)
+#define DRM_LOGE(format, ...) DLOGE(format, ##__VA_ARGS__)
+#define DRM_LOGW(format, ...) DLOGW_IF(DRM_LOG_TAG, format, ##__VA_ARGS__)
+#define DRM_LOGI(format, ...) DLOGI_IF(DRM_LOG_TAG, format, ##__VA_ARGS__)
+#define DRM_LOGD(format, ...) DLOGD_IF(DRM_LOG_TAG, format, ##__VA_ARGS__)
+#define DRM_LOGV(format, ...) DLOGV_IF(DRM_LOG_TAG, format, ##__VA_ARGS__)
} // namespace drm_utils
diff --git a/libdrmutils/drm_master.cpp b/libdrmutils/drm_master.cpp
index ff7770b..f0d14b1 100644
--- a/libdrmutils/drm_master.cpp
+++ b/libdrmutils/drm_master.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2017, The Linux Foundation. All rights reserved.
+* Copyright (c) 2017 - 2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -53,7 +53,6 @@
namespace drm_utils {
-DRMLogger *DRMLogger::s_instance = nullptr;
DRMMaster *DRMMaster::s_instance = nullptr;
mutex DRMMaster::s_lock;