diff options
| author | Sundar Raman <sunds@ti.com> | 2011-08-28 19:25:55 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-30 09:36:21 -0700 |
| commit | c7a945e0434f1b99021d46fddf88bf776da6ad37 (patch) | |
| tree | bbe7ce6dc33b95fa4111088379c72ed388ce9ceb /camera/Android.mk | |
| parent | 6c73fda9fdca5431e4e7911bb3171e36088a861e (diff) | |
| download | omap4xxx-omapzoom-c7a945e0434f1b99021d46fddf88bf776da6ad37.tar.gz | |
CameraHAL: Adds ION support to MemoryManager
MemoryManager has been updated to allocate from
ION carveout instead of 1D TILER via MemMgr.
Note:
2D TILER allocation is not supported as it is
not needed currently. We may have to add support for
it in the future.
Change-Id: I3507da9a26ef4cadfda26ee21c8e12bbce515656
Signed-off-by: Sundar Raman <sunds@ti.com>
Diffstat (limited to 'camera/Android.mk')
| -rw-r--r-- | camera/Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 0e2bb8c5..948c33c7 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -57,6 +57,7 @@ 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 \ @@ -75,7 +76,8 @@ LOCAL_SHARED_LIBRARIES:= \ libtimemmgr \ libcamera_client \ libgui \ - libdomx + libdomx \ + libion \ LOCAL_CFLAGS := -fno-short-enums -DCOPY_IMAGE_BUFFER @@ -106,6 +108,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/inc/V4LCameraAdapter \ $(LOCAL_PATH)/../libtiutils \ hardware/ti/omap4xxx/tiler \ + hardware/ti/omap4xxx/ion \ frameworks/base/include/ui \ frameworks/base/include/utils \ frameworks/base/include/media/stagefright/openmax @@ -117,7 +120,8 @@ LOCAL_SHARED_LIBRARIES:= \ libcutils \ libtiutils \ libtimemmgr \ - libcamera_client + libcamera_client \ + libion \ LOCAL_CFLAGS := -fno-short-enums -DCOPY_IMAGE_BUFFER |