diff options
| author | Daniel Levin <dendy@ti.com> | 2012-06-14 18:32:09 +0300 |
|---|---|---|
| committer | James Mills <jameswmills@ti.com> | 2012-07-10 23:12:53 -0500 |
| commit | 22ccfd42eceda29a44b1c866b1b2ee124100f5f7 (patch) | |
| tree | 6bf9e143e5d15bb7214d0423f66210d27175910e | |
| parent | 854a8fb23aee9f53cf2107883e7f8b2b00f23945 (diff) | |
| download | domx-omapzoom-22ccfd42eceda29a44b1c866b1b2ee124100f5f7.tar.gz | |
JB migration
1. Fixed LOG* macros to ALOG*
2. Fixed include directories
3. Fixed ion headers inclusion
Change-Id: Ib78dd70107ef7a38705174813ec782f120299fe8
Signed-off-by: Daniel Levin <dendy@ti.com>
| -rw-r--r-- | domx/omx_proxy_common/src/omx_proxy_common.c | 2 | ||||
| -rwxr-xr-x | mm_osal/src/timm_osal_trace.c | 6 | ||||
| -rw-r--r-- | omx_proxy_component/Android.mk | 4 | ||||
| -rwxr-xr-x | omx_proxy_component/omx_camera/src/omx_proxy_camera.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/domx/omx_proxy_common/src/omx_proxy_common.c b/domx/omx_proxy_common/src/omx_proxy_common.c index d0abe56..4d661b4 100644 --- a/domx/omx_proxy_common/src/omx_proxy_common.c +++ b/domx/omx_proxy_common/src/omx_proxy_common.c @@ -75,7 +75,7 @@ #ifdef USE_ION #include <unistd.h> -#include <ion.h> +#include <ion/ion.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/eventfd.h> diff --git a/mm_osal/src/timm_osal_trace.c b/mm_osal/src/timm_osal_trace.c index 0b835e4..4ab9328 100755 --- a/mm_osal/src/timm_osal_trace.c +++ b/mm_osal/src/timm_osal_trace.c @@ -110,18 +110,18 @@ void __TIMM_OSAL_TraceFunction(const __TIMM_OSAL_TRACE_LOCATION * loc, #if 0 // Original for reference #if ( TIMM_OSAL_DEBUG_TRACE_DETAIL > 1 ) - LOGD("%s:%d\t%s()\t", simplify_path(loc->file), loc->line, + ALOGD("%s:%d\t%s()\t", simplify_path(loc->file), loc->line, loc->function); #endif #else // Prints function_name for ERROR, WARNING and ENTRY/EXIT if ( (loc->level == 1) || (loc->level == 2) || (loc->level == 5) ) - LOGD("%s:%d\t%s()\t", simplify_path(loc->file), loc->line, + ALOGD("%s:%d\t%s()\t", simplify_path(loc->file), loc->line, loc->function); #endif char string[1000]; vsprintf(string, fmt, ap); - LOGD("%s",string); + ALOGD("%s",string); #else diff --git a/omx_proxy_component/Android.mk b/omx_proxy_component/Android.mk index 51b0205..0b62b9f 100644 --- a/omx_proxy_component/Android.mk +++ b/omx_proxy_component/Android.mk @@ -112,7 +112,7 @@ LOCAL_C_INCLUDES += \ system/core/include/cutils \ $(HARDWARE_TI_OMAP4_BASE)/hwc \ $(HARDWARE_TI_OMAP4_BASE)/camera/inc \ - frameworks/base/include/media/stagefright \ + frameworks/native/include/media/hardware \ LOCAL_SHARED_LIBRARIES := \ libmm_osal \ @@ -147,7 +147,7 @@ LOCAL_C_INCLUDES += \ system/core/include/cutils \ $(HARDWARE_TI_OMAP4_BASE)/hwc \ $(HARDWARE_TI_OMAP4_BASE)/camera/inc \ - frameworks/base/include/media/stagefright \ + frameworks/native/include/media/hardware \ LOCAL_SHARED_LIBRARIES := \ libmm_osal \ diff --git a/omx_proxy_component/omx_camera/src/omx_proxy_camera.c b/omx_proxy_component/omx_camera/src/omx_proxy_camera.c index a838bd2..f411d28 100755 --- a/omx_proxy_component/omx_camera/src/omx_proxy_camera.c +++ b/omx_proxy_component/omx_camera/src/omx_proxy_camera.c @@ -75,7 +75,7 @@ #ifdef USE_ION #include <unistd.h> -#include <ion.h> +#include <ion/ion.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/eventfd.h> |