diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2012-06-28 15:08:22 -0700 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2012-06-28 15:08:22 -0700 |
| commit | 4a35937fcb950ccd05af56c49214b88e393233e3 (patch) | |
| tree | 0fcbde0b01bc6ee6d2aeef61ce8c5b84a32e8049 /camera | |
| parent | 1cd363ddf9566cd3ec5814c9f7382baace8eee49 (diff) | |
| download | hardware_ti_omap4xxx-4a35937fcb950ccd05af56c49214b88e393233e3.tar.gz hardware_ti_omap4xxx-4a35937fcb950ccd05af56c49214b88e393233e3.tar.bz2 hardware_ti_omap4xxx-4a35937fcb950ccd05af56c49214b88e393233e3.zip | |
Put back old ion library
Non-backwards compatible changes are being made to the version in system core
Change-Id: I66d5119fb28a7eb3dc6cb9f7cbd1a8a8d902f290
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/Android.mk | 3 | ||||
| -rw-r--r-- | camera/MemoryManager.cpp | 2 |
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> |