summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
Diffstat (limited to 'camera')
-rw-r--r--camera/Android.mk3
-rw-r--r--camera/MemoryManager.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/camera/Android.mk b/camera/Android.mk
index 1d7e048..2d8da11 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -59,6 +59,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/inc/OMXCameraAdapter \
$(LOCAL_PATH)/../libtiutils \
hardware/ti/omap4xxx/tiler \
+ hardware/ti/omap4xxx/ion \
hardware/ti/omap4xxx/domx/omx_core/inc \
hardware/ti/omap4xxx/domx/mm_osal/inc \
frameworks/base/include/media/stagefright \
@@ -78,7 +79,7 @@ LOCAL_SHARED_LIBRARIES:= \
libcamera_client \
libgui \
libdomx \
- libion \
+ libion_ti \
libjpeg \
libexif
diff --git a/camera/MemoryManager.cpp b/camera/MemoryManager.cpp
index b1dbbcf..8631bbd 100644
--- a/camera/MemoryManager.cpp
+++ b/camera/MemoryManager.cpp
@@ -24,7 +24,7 @@
extern "C" {
-#include <ion/ion.h>
+#include <ion.h>
//#include <timm_osal_interfaces.h>
//#include <timm_osal_trace.h>