diff options
author | Mathew Karimpanal <kjmathew@codeaurora.org> | 2012-11-12 22:27:02 -0800 |
---|---|---|
committer | Mathew Karimpanal <kjmathew@codeaurora.org> | 2012-12-12 17:49:17 -0800 |
commit | dec98cc96e47c12e819717a1e6a7fbeeb6f4537a (patch) | |
tree | 03f34eac20fe1a63ad5e696a9893ce2e80b3dc2a | |
parent | e97c35ffb5844645941202bcc52973dfd3998744 (diff) | |
download | display-dec98cc96e47c12e819717a1e6a7fbeeb6f4537a.tar.gz |
display: Standardize log-tags for qcom display logs.
Change-Id: I75bc2d8db8d64994097d6b744f357c29c9a5717a
-rw-r--r-- | libcopybit/Android.mk | 6 | ||||
-rw-r--r-- | libcopybit/copybit.cpp | 3 | ||||
-rw-r--r-- | libcopybit/copybit_c2d.cpp | 2 | ||||
-rw-r--r-- | libcopybit/software_converter.cpp | 1 | ||||
-rw-r--r-- | libexternal/Android.mk | 3 | ||||
-rw-r--r-- | libgenlock/Android.mk | 4 | ||||
-rw-r--r-- | libgralloc/Android.mk | 11 | ||||
-rw-r--r-- | libhwcomposer/Android.mk | 6 | ||||
-rw-r--r-- | liblight/Android.mk | 1 | ||||
-rw-r--r-- | liblight/lights.c | 1 | ||||
-rw-r--r-- | liboverlay/Android.mk | 3 | ||||
-rw-r--r-- | liboverlay/overlayMdp.cpp | 3 | ||||
-rw-r--r-- | libqdutils/Android.mk | 3 | ||||
-rw-r--r-- | libqdutils/profiler.cpp | 1 | ||||
-rw-r--r-- | libqservice/Android.mk | 3 | ||||
-rw-r--r-- | libtilerenderer/Android.mk | 3 |
16 files changed, 26 insertions, 28 deletions
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk index 2c28a7be..55d421b1 100644 --- a/libcopybit/Android.mk +++ b/libcopybit/Android.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2008 The Android Open Source Project +# Copyright (C) 2012 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,15 +15,15 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) + LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libmemalloc -LOCAL_CFLAGS := $(common_flags) +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdcopybit\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) - ifeq ($(TARGET_USES_C2D_COMPOSITION),true) LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1 LOCAL_SRC_FILES := copybit_c2d.cpp software_converter.cpp diff --git a/libcopybit/copybit.cpp b/libcopybit/copybit.cpp index f79c33bb..773e9b85 100644 --- a/libcopybit/copybit.cpp +++ b/libcopybit/copybit.cpp @@ -15,9 +15,6 @@ * limitations under the License. */ - -#define LOG_TAG "copybit" - #include <cutils/log.h> #include <linux/msm_mdp.h> diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp index 365be5f3..ea5dd2a0 100644 --- a/libcopybit/copybit_c2d.cpp +++ b/libcopybit/copybit_c2d.cpp @@ -15,8 +15,6 @@ * limitations under the License. */ -#define LOG_TAG "copybit_c2d" - #include <cutils/log.h> #include <stdint.h> diff --git a/libcopybit/software_converter.cpp b/libcopybit/software_converter.cpp index c9bb6743..ec0f271e 100644 --- a/libcopybit/software_converter.cpp +++ b/libcopybit/software_converter.cpp @@ -27,7 +27,6 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define LOG_TAG "copybit" #include <cutils/log.h> #include <stdlib.h> #include <errno.h> diff --git a/libexternal/Android.mk b/libexternal/Android.mk index cdbbd5c2..f723113c 100644 --- a/libexternal/Android.mk +++ b/libexternal/Android.mk @@ -1,12 +1,13 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) + LOCAL_MODULE := libexternal LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"external\" +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdexternal\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := external.cpp diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk index 92ac2279..96e8b4ec 100644 --- a/libgenlock/Android.mk +++ b/libgenlock/Android.mk @@ -6,8 +6,8 @@ LOCAL_MODULE := libgenlock LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := liblog libcutils -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"libgenlock\" +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgenlock\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := genlock.cpp -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_SHARED_LIBRARY) diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index 9d6afbc4..159a252c 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -#gralloc module +# Gralloc module LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) @@ -23,18 +23,21 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc libgenlock LOCAL_SHARED_LIBRARIES += libqdutils libGLESv1_CM -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"gralloc\" +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_SRC_FILES := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp + include $(BUILD_SHARED_LIBRARY) -#MemAlloc Library +# MemAlloc Library include $(CLEAR_VARS) + LOCAL_MODULE := libmemalloc LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libgenlock -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"memalloc\" +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp + include $(BUILD_SHARED_LIBRARY) diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk index 24fd2d45..543efd96 100644 --- a/libhwcomposer/Android.mk +++ b/libhwcomposer/Android.mk @@ -1,6 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) + LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_MODULE_TAGS := optional @@ -8,8 +9,7 @@ LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libEGL liboverlay libgenlock \ libexternal libqdutils libhardware_legacy \ libdl libmemalloc libqservice - -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"hwcomposer\" +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdhwcomposer\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := hwc.cpp \ hwc_video.cpp \ @@ -17,6 +17,6 @@ LOCAL_SRC_FILES := hwc.cpp \ hwc_uevents.cpp \ hwc_vsync.cpp \ hwc_fbupdate.cpp \ - hwc_mdpcomp.cpp \ + hwc_mdpcomp.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/liblight/Android.mk b/liblight/Android.mk index 93ece2fb..40115d5b 100644 --- a/liblight/Android.mk +++ b/liblight/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := lights.c LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SHARED_LIBRARIES := liblog +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdlights\" LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_TAGS := optional diff --git a/liblight/lights.c b/liblight/lights.c index b9d1e486..2c627448 100644 --- a/liblight/lights.c +++ b/liblight/lights.c @@ -16,7 +16,6 @@ // #define LOG_NDEBUG 0 -#define LOG_TAG "lights" #include <cutils/log.h> diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk index 39244fd7..82c6610c 100644 --- a/liboverlay/Android.mk +++ b/liboverlay/Android.mk @@ -1,12 +1,13 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) + LOCAL_MODULE := liboverlay LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libmemalloc -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"overlay\" +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdoverlay\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := \ overlay.cpp \ diff --git a/liboverlay/overlayMdp.cpp b/liboverlay/overlayMdp.cpp index f4e0b517..48630a5c 100644 --- a/liboverlay/overlayMdp.cpp +++ b/liboverlay/overlayMdp.cpp @@ -18,9 +18,6 @@ #include "overlayUtils.h" #include "overlayMdp.h" -#undef ALOG_TAG -#define ALOG_TAG "overlay" - namespace ovutils = overlay::utils; namespace overlay { diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk index 61daeacf..ed8bed02 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -6,8 +6,9 @@ LOCAL_MODULE := libqdutils LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := $(common_libs) LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) -LOCAL_CFLAGS := $(common_flags) +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := profiler.cpp mdp_version.cpp \ idle_invalidator.cpp + include $(BUILD_SHARED_LIBRARY) diff --git a/libqdutils/profiler.cpp b/libqdutils/profiler.cpp index a06ec4d2..e39b3048 100644 --- a/libqdutils/profiler.cpp +++ b/libqdutils/profiler.cpp @@ -27,7 +27,6 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define LOG_TAG "CALCFPS" #define LOG_NDDEBUG 0 #include "profiler.h" diff --git a/libqservice/Android.mk b/libqservice/Android.mk index ee1fe218..8e82f429 100644 --- a/libqservice/Android.mk +++ b/libqservice/Android.mk @@ -1,12 +1,13 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) + LOCAL_MODULE := libqservice LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libexternal libbinder -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qService\" +LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdqservice\" LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := QService.cpp \ IQService.cpp diff --git a/libtilerenderer/Android.mk b/libtilerenderer/Android.mk index af8f25f0..ca17fbc3 100644 --- a/libtilerenderer/Android.mk +++ b/libtilerenderer/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) ifeq ($(USE_OPENGL_RENDERER),true) LOCAL_MODULE := libtilerenderer LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := -DLOG_TAG=\"qdtilerenderer\" LOCAL_C_INCLUDES := \ frameworks/base/include/utils \ frameworks/base/libs/hwui \ @@ -15,8 +16,8 @@ LOCAL_C_INCLUDES := \ external/skia/include/utils \ hardware/libhardware/include/hardware \ frameworks/base/opengl/include/GLES2 - LOCAL_SHARED_LIBRARIES := $(common_libs) libGLESv2 libhwui LOCAL_SRC_FILES := tilerenderer.cpp + include $(BUILD_SHARED_LIBRARY) endif |