summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2012-07-22 16:14:08 +0200
committerDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2012-07-22 16:14:08 +0200
commit353fecb128199378439a3e8da8200f654551a526 (patch)
treef04a2ab659ac3ec505407daf33e86cf1de27f941
parent0fdadcaf08c588469ad9905b0136c894bb062fdf (diff)
downloadandroid_hardware_samsung-353fecb128199378439a3e8da8200f654551a526.tar.gz
android_hardware_samsung-353fecb128199378439a3e8da8200f654551a526.tar.bz2
android_hardware_samsung-353fecb128199378439a3e8da8200f654551a526.zip
underp logging
-rw-r--r--exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c4
-rw-r--r--exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c2
-rw-r--r--exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c2
-rw-r--r--exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c2
-rw-r--r--exynos/multimedia/codecs/audio/exynos5/srp/alp/src/srp_api.c4
-rw-r--r--exynos/multimedia/codecs/video/exynos4/mfc/dec/src/SsbSipMfcDecAPI.c6
-rw-r--r--exynos/multimedia/codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c6
-rw-r--r--exynos/multimedia/codecs/video/exynos4/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c4
-rw-r--r--exynos/multimedia/codecs/video/exynos4/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c4
-rw-r--r--exynos/multimedia/codecs/video/exynos5/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c4
-rw-r--r--exynos/multimedia/codecs/video/exynos5/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c4
-rw-r--r--exynos4/hal/libcamera/SecCamera.cpp4
-rw-r--r--exynos4/hal/libcamera/SecCameraHWInterface.cpp4
-rw-r--r--exynos4/hal/libfimc/SecFimc.cpp2
-rw-r--r--exynos4/hal/libfimg3x/FimgC210.cpp4
-rw-r--r--exynos4/hal/libfimg4x/FimgApi.cpp4
-rw-r--r--exynos4/hal/libfimg4x/FimgExynos4.cpp4
-rw-r--r--exynos4/hal/libgralloc_ump/Android.mk3
-rw-r--r--exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp4
-rw-r--r--exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h4
-rw-r--r--exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp4
-rw-r--r--exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h4
-rw-r--r--exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp2
-rw-r--r--exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp2
-rw-r--r--exynos4/hal/libhwjpeg/jpeg_hal_unit.c2
-rw-r--r--exynos4/hal/libs5pjpeg/jpeg_api.c4
-rw-r--r--exynos5/hal/libcamera/SecCamera.cpp4
-rw-r--r--exynos5/hal/libcamera/SecCameraHWInterface.cpp4
-rw-r--r--exynos5/hal/libcamera/mediactl.cpp4
-rw-r--r--exynos5/hal/libfimg4x/FimgApi.cpp4
-rw-r--r--exynos5/hal/libfimg4x/FimgExynos5.cpp4
-rw-r--r--exynos5/hal/libgralloc_ump/Android.mk4
-rw-r--r--exynos5/hal/libhdmi/SecHdmi/SecGscaler.cpp2
-rw-r--r--exynos5/hal/libhdmi/SecHdmi/SecHdmi.cpp4
-rw-r--r--exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp4
-rw-r--r--exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h4
-rw-r--r--exynos5/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp2
-rw-r--r--exynos5/hal/libhdmi/libhdmiservice/SecTVOutService.cpp2
38 files changed, 67 insertions, 68 deletions
diff --git a/exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c b/exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c
index 73c8c04..59e4c4e 100644
--- a/exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c
+++ b/exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c
@@ -12,8 +12,8 @@
#include "srp_api.h"
-#define ALOG_NDEBUG 1
-#define ALOG_TAG "libsrpapi"
+#define LOG_NDEBUG 1
+#define LOG_TAG "libsrpapi"
#include <utils/Log.h>
static struct srp_buf_info ibuf_info;
diff --git a/exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c b/exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c
index 9e696f4..65f3a66 100644
--- a/exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c
+++ b/exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c
@@ -7,7 +7,7 @@
#include "srp_api_ctrl.h"
-#define ALOG_TAG "libsa_jni"
+#define LOG_TAG "libsa_jni"
#include <cutils/log.h>
void Java_com_android_music_SetSACtrlJNI_set(JNIEnv * env, jobject obj, int effect_num)
diff --git a/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c b/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c
index 2848346..cf224eb 100644
--- a/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c
+++ b/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c
@@ -12,7 +12,7 @@
#include "srp_api.h"
-#define ALOG_TAG "libsrpapi"
+#define LOG_TAG "libsrpapi"
#include <cutils/log.h>
/* Disable ALOGD message */
diff --git a/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c b/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c
index ed32089..f9a2b61 100644
--- a/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c
+++ b/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c
@@ -13,7 +13,7 @@
#include "srp_api_ctrl.h"
#include "srp_ioctl.h"
-#define ALOG_TAG "libsrpapi"
+#define LOG_TAG "libsrpapi"
#include <cutils/log.h>
/* Disable ALOGD message */
diff --git a/exynos/multimedia/codecs/audio/exynos5/srp/alp/src/srp_api.c b/exynos/multimedia/codecs/audio/exynos5/srp/alp/src/srp_api.c
index 73c8c04..59e4c4e 100644
--- a/exynos/multimedia/codecs/audio/exynos5/srp/alp/src/srp_api.c
+++ b/exynos/multimedia/codecs/audio/exynos5/srp/alp/src/srp_api.c
@@ -12,8 +12,8 @@
#include "srp_api.h"
-#define ALOG_NDEBUG 1
-#define ALOG_TAG "libsrpapi"
+#define LOG_NDEBUG 1
+#define LOG_TAG "libsrpapi"
#include <utils/Log.h>
static struct srp_buf_info ibuf_info;
diff --git a/exynos/multimedia/codecs/video/exynos4/mfc/dec/src/SsbSipMfcDecAPI.c b/exynos/multimedia/codecs/video/exynos4/mfc/dec/src/SsbSipMfcDecAPI.c
index df985dc..8f95439 100644
--- a/exynos/multimedia/codecs/video/exynos4/mfc/dec/src/SsbSipMfcDecAPI.c
+++ b/exynos/multimedia/codecs/video/exynos4/mfc/dec/src/SsbSipMfcDecAPI.c
@@ -34,9 +34,9 @@
#include "SsbSipMfcApi.h"
#include <utils/Log.h>
-/*#define ALOG_NDEBUG 0*/
-#undef ALOG_TAG
-#define ALOG_TAG "MFC_DEC_APP"
+/*#define LOG_NDEBUG 0*/
+#undef LOG_TAG
+#define LOG_TAG "MFC_DEC_APP"
#ifdef CONFIG_MFC_FPS
#include <sys/time.h>
diff --git a/exynos/multimedia/codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c b/exynos/multimedia/codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c
index 92df6b0..387471c 100644
--- a/exynos/multimedia/codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c
+++ b/exynos/multimedia/codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c
@@ -30,9 +30,9 @@
#include "SsbSipMfcApi.h"
#include <utils/Log.h>
-/* #define ALOG_NDEBUG 0 */
-#undef ALOG_TAG
-#define ALOG_TAG "MFC_ENC_APP"
+/* #define LOG_NDEBUG 0 */
+#undef LOG_TAG
+#define LOG_TAG "MFC_ENC_APP"
#define _MFCLIB_MAGIC_NUMBER 0x92241001
diff --git a/exynos/multimedia/codecs/video/exynos4/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c b/exynos/multimedia/codecs/video/exynos4/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c
index cad62e3..ad14f16 100644
--- a/exynos/multimedia/codecs/video/exynos4/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c
+++ b/exynos/multimedia/codecs/video/exynos4/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c
@@ -36,8 +36,8 @@
#include "mfc_interface.h"
#include "SsbSipMfcApi.h"
-/* #define ALOG_NDEBUG 0 */
-#define ALOG_TAG "MFC_DEC_APP"
+/* #define LOG_NDEBUG 0 */
+#define LOG_TAG "MFC_DEC_APP"
#include <utils/Log.h>
#ifdef CONFIG_MFC_FPS
diff --git a/exynos/multimedia/codecs/video/exynos4/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c b/exynos/multimedia/codecs/video/exynos4/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c
index d35e153..b62f1ee 100644
--- a/exynos/multimedia/codecs/video/exynos4/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c
+++ b/exynos/multimedia/codecs/video/exynos4/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c
@@ -31,8 +31,8 @@
#include "mfc_interface.h"
#include "SsbSipMfcApi.h"
-/* #define ALOG_NDEBUG 0 */
-#define ALOG_TAG "MFC_ENC_APP"
+/* #define LOG_NDEBUG 0 */
+#define LOG_TAG "MFC_ENC_APP"
#include <utils/Log.h>
#define POLL_ENC_WAIT_TIMEOUT 25
diff --git a/exynos/multimedia/codecs/video/exynos5/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c b/exynos/multimedia/codecs/video/exynos5/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c
index d09a553..99aef76 100644
--- a/exynos/multimedia/codecs/video/exynos5/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c
+++ b/exynos/multimedia/codecs/video/exynos5/mfc_v4l2/dec/src/SsbSipMfcDecAPI.c
@@ -39,8 +39,8 @@
#include "ion.h"
#endif
-/* #define ALOG_NDEBUG 0 */
-#define ALOG_TAG "MFC_DEC_APP"
+/* #define LOG_NDEBUG 0 */
+#define LOG_TAG "MFC_DEC_APP"
#include <utils/Log.h>
#ifdef CONFIG_MFC_FPS
diff --git a/exynos/multimedia/codecs/video/exynos5/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c b/exynos/multimedia/codecs/video/exynos5/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c
index b444fd2..413e734 100644
--- a/exynos/multimedia/codecs/video/exynos5/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c
+++ b/exynos/multimedia/codecs/video/exynos5/mfc_v4l2/enc/src/SsbSipMfcEncAPI.c
@@ -31,8 +31,8 @@
#include "mfc_interface.h"
#include "SsbSipMfcApi.h"
-/* #define ALOG_NDEBUG 0 */
-#define ALOG_TAG "MFC_ENC_APP"
+/* #define LOG_NDEBUG 0 */
+#define LOG_TAG "MFC_ENC_APP"
#include <utils/Log.h>
#define POLL_ENC_WAIT_TIMEOUT 25
diff --git a/exynos4/hal/libcamera/SecCamera.cpp b/exynos4/hal/libcamera/SecCamera.cpp
index 97f4708..68bdc5f 100644
--- a/exynos4/hal/libcamera/SecCamera.cpp
+++ b/exynos4/hal/libcamera/SecCamera.cpp
@@ -23,8 +23,8 @@
*************************************
*/
-//#define ALOG_NDEBUG 0
-#define ALOG_TAG "SecCamera"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "SecCamera"
#include <utils/Log.h>
#include <string.h>
diff --git a/exynos4/hal/libcamera/SecCameraHWInterface.cpp b/exynos4/hal/libcamera/SecCameraHWInterface.cpp
index 3c2250e..b7077eb 100644
--- a/exynos4/hal/libcamera/SecCameraHWInterface.cpp
+++ b/exynos4/hal/libcamera/SecCameraHWInterface.cpp
@@ -15,8 +15,8 @@
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-//#define ALOG_NDEBUG 0
-#define ALOG_TAG "CameraHardwareSec"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "CameraHardwareSec"
#include <utils/Log.h>
#include "SecCameraHWInterface.h"
diff --git a/exynos4/hal/libfimc/SecFimc.cpp b/exynos4/hal/libfimc/SecFimc.cpp
index 86728a8..a924235 100644
--- a/exynos4/hal/libfimc/SecFimc.cpp
+++ b/exynos4/hal/libfimc/SecFimc.cpp
@@ -29,7 +29,7 @@
* Adjust V4L2 architecture \n
*/
-#define ALOG_TAG "libfimc"
+#define LOG_TAG "libfimc"
#include <cutils/log.h>
#include "SecFimc.h"
diff --git a/exynos4/hal/libfimg3x/FimgC210.cpp b/exynos4/hal/libfimg3x/FimgC210.cpp
index 472438f..129acae 100644
--- a/exynos4/hal/libfimg3x/FimgC210.cpp
+++ b/exynos4/hal/libfimg3x/FimgC210.cpp
@@ -20,8 +20,8 @@
///////////////////////////////////////////////////
// include
///////////////////////////////////////////////////
-#define ALOG_NDEBUG 0
-#define ALOG_TAG "FimgC210"
+#define LOG_NDEBUG 0
+#define LOG_TAG "FimgC210"
#include <utils/Log.h>
#include "FimgC210.h"
diff --git a/exynos4/hal/libfimg4x/FimgApi.cpp b/exynos4/hal/libfimg4x/FimgApi.cpp
index 57d0f27..444e9c9 100644
--- a/exynos4/hal/libfimg4x/FimgApi.cpp
+++ b/exynos4/hal/libfimg4x/FimgApi.cpp
@@ -17,8 +17,8 @@
**
*/
-#define ALOG_NDEBUG 0
-#define ALOG_TAG "SKIA"
+#define LOG_NDEBUG 0
+#define LOG_TAG "SKIA"
#include <utils/Log.h>
#include "FimgApi.h"
diff --git a/exynos4/hal/libfimg4x/FimgExynos4.cpp b/exynos4/hal/libfimg4x/FimgExynos4.cpp
index a203683..f9a7f1e 100644
--- a/exynos4/hal/libfimg4x/FimgExynos4.cpp
+++ b/exynos4/hal/libfimg4x/FimgExynos4.cpp
@@ -17,8 +17,8 @@
**
*/
-#define ALOG_NDEBUG 0
-#define ALOG_TAG "FimgExynos4"
+#define LOG_NDEBUG 0
+#define LOG_TAG "FimgExynos4"
#include <utils/Log.h>
#include "FimgExynos4.h"
diff --git a/exynos4/hal/libgralloc_ump/Android.mk b/exynos4/hal/libgralloc_ump/Android.mk
index a2141e8..005c817 100644
--- a/exynos4/hal/libgralloc_ump/Android.mk
+++ b/exynos4/hal/libgralloc_ump/Android.mk
@@ -37,9 +37,8 @@ LOCAL_SRC_FILES := \
framebuffer_device.cpp
LOCAL_MODULE_TAGS := eng
-#LOCAL_MODULE := gralloc.default
LOCAL_MODULE := gralloc.$(TARGET_DEVICE)
-LOCAL_CFLAGS:= -DALOG_TAG=\"gralloc\" -DGRALLOC_32_BITS -DSTANDARD_LINUX_SCREEN
+LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -DGRALLOC_32_BITS -DSTANDARD_LINUX_SCREEN
#LOCAL_CFLAGS+= -DMALI_VSYNC_EVENT_REPORT_ENABLE
LOCAL_CFLAGS += -DSAMSUNG_EXYNOS
diff --git a/exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp b/exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp
index e6be6e7..021898c 100644
--- a/exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp
+++ b/exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-//#define ALOG_NDEBUG 0
-//#define ALOG_TAG "libhdmi"
+//#define LOG_NDEBUG 0
+//#define LOG_TAG "libhdmi"
#include <cutils/log.h>
#if defined(BOARD_USE_V4L2_ION)
diff --git a/exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h b/exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h
index a90e687..203dfe4 100644
--- a/exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h
+++ b/exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h
@@ -18,8 +18,8 @@
**
*/
-//#define ALOG_NDEBUG 0
-//#define ALOG_TAG "libhdmi"
+//#define LOG_NDEBUG 0
+//#define LOG_TAG "libhdmi"
#include <cutils/log.h>
#include "videodev2.h"
diff --git a/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp b/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
index fd135f1..f3ae1ac 100644
--- a/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
+++ b/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-//#define ALOG_NDEBUG 0
-//#define ALOG_TAG "libhdmi"
+//#define LOG_NDEBUG 0
+//#define LOG_TAG "libhdmi"
#include <cutils/log.h>
#include <sys/types.h>
diff --git a/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h b/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
index f31169e..a4aa69c 100644
--- a/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
+++ b/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
@@ -17,8 +17,8 @@
#ifndef __HDMI_HAL_V4L2_UTILS_H__
#define __HDMI_HAL_V4L2_UTILS_H__
-//#define ALOG_NDEBUG 0
-//#define ALOG_TAG "libhdmi"
+//#define LOG_NDEBUG 0
+//#define LOG_TAG "libhdmi"
#if defined(BOARD_USE_V4L2)
#include "SecBuffer.h"
#endif
diff --git a/exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp b/exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
index 9fd330c..2e327e6 100644
--- a/exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
+++ b/exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
@@ -22,7 +22,7 @@
** @date 2011-07-06
*/
-#define ALOG_TAG "libhdmiclient"
+#define LOG_TAG "libhdmiclient"
#include "SecHdmiClient.h"
diff --git a/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp b/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
index 7308473..c0150a3 100644
--- a/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
+++ b/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
@@ -22,7 +22,7 @@
** @date 2011-07-06
*/
-#define ALOG_TAG "SecTVOutService"
+#define LOG_TAG "SecTVOutService"
#include <binder/IServiceManager.h>
#include <utils/RefBase.h>
diff --git a/exynos4/hal/libhwjpeg/jpeg_hal_unit.c b/exynos4/hal/libhwjpeg/jpeg_hal_unit.c
index 00363f5..6764bd5 100644
--- a/exynos4/hal/libhwjpeg/jpeg_hal_unit.c
+++ b/exynos4/hal/libhwjpeg/jpeg_hal_unit.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define ALOG_TAG "libhwjpeg"
+#define LOG_TAG "libhwjpeg"
#include <stdio.h>
#include <stdlib.h>
diff --git a/exynos4/hal/libs5pjpeg/jpeg_api.c b/exynos4/hal/libs5pjpeg/jpeg_api.c
index d557a13..e5247e3 100644
--- a/exynos4/hal/libs5pjpeg/jpeg_api.c
+++ b/exynos4/hal/libs5pjpeg/jpeg_api.c
@@ -16,8 +16,8 @@
** limitations under the License.
*/
-//#define ALOG_NDEBUG 0
-#define ALOG_TAG "Jpeg-api"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "Jpeg-api"
#include <utils/Log.h>
#include <stdio.h>
diff --git a/exynos5/hal/libcamera/SecCamera.cpp b/exynos5/hal/libcamera/SecCamera.cpp
index bd18479..aad6c79 100644
--- a/exynos5/hal/libcamera/SecCamera.cpp
+++ b/exynos5/hal/libcamera/SecCamera.cpp
@@ -23,8 +23,8 @@
*************************************
*/
-//#define ALOG_NDEBUG 0
-#define ALOG_TAG "SecCamera"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "SecCamera"
#include <utils/Log.h>
#include <string.h>
diff --git a/exynos5/hal/libcamera/SecCameraHWInterface.cpp b/exynos5/hal/libcamera/SecCameraHWInterface.cpp
index 3609902..717cb78 100644
--- a/exynos5/hal/libcamera/SecCameraHWInterface.cpp
+++ b/exynos5/hal/libcamera/SecCameraHWInterface.cpp
@@ -15,8 +15,8 @@
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-//#define ALOG_NDEBUG 0
-#define ALOG_TAG "CameraHardwareSec"
+//#define LOG_NDEBUG 0
+#define LOG_TAG "CameraHardwareSec"
#include <utils/Log.h>
#include "SecCameraHWInterface.h"
diff --git a/exynos5/hal/libcamera/mediactl.cpp b/exynos5/hal/libcamera/mediactl.cpp
index 951acc0..82aa90a 100644
--- a/exynos5/hal/libcamera/mediactl.cpp
+++ b/exynos5/hal/libcamera/mediactl.cpp
@@ -20,8 +20,8 @@
*/
//#include "config.h"
-#define ALOG_NDEBUG 0
-#define ALOG_TAG "Mediactl"
+#define LOG_NDEBUG 0
+#define LOG_TAG "Mediactl"
#include <utils/Log.h>
#include <sys/ioctl.h>
diff --git a/exynos5/hal/libfimg4x/FimgApi.cpp b/exynos5/hal/libfimg4x/FimgApi.cpp
index 57d0f27..444e9c9 100644
--- a/exynos5/hal/libfimg4x/FimgApi.cpp
+++ b/exynos5/hal/libfimg4x/FimgApi.cpp
@@ -17,8 +17,8 @@
**
*/
-#define ALOG_NDEBUG 0
-#define ALOG_TAG "SKIA"
+#define LOG_NDEBUG 0
+#define LOG_TAG "SKIA"
#include <utils/Log.h>
#include "FimgApi.h"
diff --git a/exynos5/hal/libfimg4x/FimgExynos5.cpp b/exynos5/hal/libfimg4x/FimgExynos5.cpp
index 59d8394..87c8527 100644
--- a/exynos5/hal/libfimg4x/FimgExynos5.cpp
+++ b/exynos5/hal/libfimg4x/FimgExynos5.cpp
@@ -17,8 +17,8 @@
**
*/
-#define ALOG_NDEBUG 0
-#define ALOG_TAG "FimgExynos5"
+#define LOG_NDEBUG 0
+#define LOG_TAG "FimgExynos5"
#include <utils/Log.h>
#include "FimgExynos5.h"
diff --git a/exynos5/hal/libgralloc_ump/Android.mk b/exynos5/hal/libgralloc_ump/Android.mk
index 84cac10..a4354d4 100644
--- a/exynos5/hal/libgralloc_ump/Android.mk
+++ b/exynos5/hal/libgralloc_ump/Android.mk
@@ -40,14 +40,14 @@ LOCAL_SRC_FILES := \
ifeq ($(TARGET_PRODUCT), armboard_v7a)
# Support for ARM platforms
-LOCAL_CFLAGS:= -DALOG_TAG=\"gralloc\" -DGRALLOC_16_BITS -DSTANDARD_LINUX_SCREEN \
+LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -DGRALLOC_16_BITS -DSTANDARD_LINUX_SCREEN \
-march=armv7-a \
-mfloat-abi=softfp
LOCAL_MODULE := gralloc.default
else
#Default to goldfish
-LOCAL_CFLAGS:= -DALOG_TAG=\"gralloc\" -DSTANDARD_LINUX_SCREEN \
+LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -DSTANDARD_LINUX_SCREEN \
-march=armv7-a \
-mfloat-abi=softfp \
-DVITHAR_HACK
diff --git a/exynos5/hal/libhdmi/SecHdmi/SecGscaler.cpp b/exynos5/hal/libhdmi/SecHdmi/SecGscaler.cpp
index 6920042..5da1c72 100644
--- a/exynos5/hal/libhdmi/SecHdmi/SecGscaler.cpp
+++ b/exynos5/hal/libhdmi/SecHdmi/SecGscaler.cpp
@@ -16,7 +16,7 @@
*/
//#define DEBUG_LIB_FIMC
-#define ALOG_TAG "libgscaler"
+#define LOG_TAG "libgscaler"
//#define USE_GSC_USERPTR
#include <cutils/log.h>
#include "../libhdmi/SecHdmi/SecGscaler.h"
diff --git a/exynos5/hal/libhdmi/SecHdmi/SecHdmi.cpp b/exynos5/hal/libhdmi/SecHdmi/SecHdmi.cpp
index 8c0970b..bb395d5 100644
--- a/exynos5/hal/libhdmi/SecHdmi/SecHdmi.cpp
+++ b/exynos5/hal/libhdmi/SecHdmi/SecHdmi.cpp
@@ -15,8 +15,8 @@
*/
//#define DEBUG_MSG_ENABLE
-//#define ALOG_NDEBUG 0
-//#define ALOG_TAG "libhdmi"
+//#define LOG_NDEBUG 0
+//#define LOG_TAG "libhdmi"
#include <cutils/log.h>
#include "ion.h"
#include "SecHdmi.h"
diff --git a/exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp b/exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
index e3f0f30..9a66d6d 100644
--- a/exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
+++ b/exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-//#define ALOG_NDEBUG 0
-//#define ALOG_TAG "libhdmi"
+//#define LOG_NDEBUG 0
+//#define LOG_TAG "libhdmi"
//#define DEBUG_HDMI_HW_LEVEL
#include <cutils/log.h>
diff --git a/exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h b/exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
index c772bf1..67c0729 100644
--- a/exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
+++ b/exynos5/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
@@ -17,8 +17,8 @@
#ifndef __HDMI_HAL_V4L2_UTILS_H__
#define __HDMI_HAL_V4L2_UTILS_H__
-//#define ALOG_NDEBUG 0
-//#define ALOG_TAG "libhdmi"
+//#define LOG_NDEBUG 0
+//#define LOG_TAG "libhdmi"
#include "fimd_api.h"
#include "SecBuffer.h"
diff --git a/exynos5/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp b/exynos5/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
index 430ea4e..21cac99 100644
--- a/exynos5/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
+++ b/exynos5/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
@@ -22,7 +22,7 @@
** @date 2011-07-06
*/
-#define ALOG_TAG "libhdmiclient"
+#define LOG_TAG "libhdmiclient"
#include "SecHdmiClient.h"
diff --git a/exynos5/hal/libhdmi/libhdmiservice/SecTVOutService.cpp b/exynos5/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
index 3666106..453cf70 100644
--- a/exynos5/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
+++ b/exynos5/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
@@ -22,7 +22,7 @@
** @date 2011-07-06
*/
-#define ALOG_TAG "SecTVOutService"
+#define LOG_TAG "SecTVOutService"
#include <binder/IServiceManager.h>
#include <utils/RefBase.h>