summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorRebecca Schultz Zavin <rebecca@android.com>2012-02-22 16:30:18 -0800
committerRebecca Schultz Zavin <rebecca@android.com>2012-02-22 16:30:18 -0800
commit49d75012a1396ec9493c612f256896b97d87688b (patch)
tree6f276ea278f47109977989aa745a98ccd699799a /camera
parent5703f6d63cead1c511f23531cfb13c5ba6de576b (diff)
downloadhardware_ti_omap4xxx-49d75012a1396ec9493c612f256896b97d87688b.zip
hardware_ti_omap4xxx-49d75012a1396ec9493c612f256896b97d87688b.tar.gz
hardware_ti_omap4xxx-49d75012a1396ec9493c612f256896b97d87688b.tar.bz2
Update includes for ion helper library
libion is being moved to system/core. Update the includes to reflect the change. Change-Id: If94feb9b89ff1f6c8f55303ba610d3c39c8d80d8 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Diffstat (limited to 'camera')
-rw-r--r--camera/Android.mk1
-rw-r--r--camera/MemoryManager.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/camera/Android.mk b/camera/Android.mk
index a84d0f9..62056c0 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -59,7 +59,6 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/inc/OMXCameraAdapter \
$(LOCAL_PATH)/../libtiutils \
hardware/ti/omap4xxx/tiler \
- hardware/ti/omap4xxx/ion \
frameworks/base/include/ui \
frameworks/base/include/utils \
hardware/ti/omap4xxx/domx/omx_core/inc \
diff --git a/camera/MemoryManager.cpp b/camera/MemoryManager.cpp
index 8631bbd..b1dbbcf 100644
--- a/camera/MemoryManager.cpp
+++ b/camera/MemoryManager.cpp
@@ -24,7 +24,7 @@
extern "C" {
-#include <ion.h>
+#include <ion/ion.h>
//#include <timm_osal_interfaces.h>
//#include <timm_osal_trace.h>