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 /domx | |
| parent | 1cd363ddf9566cd3ec5814c9f7382baace8eee49 (diff) | |
| download | hardware_ti_omap4xxx-4a35937fcb950ccd05af56c49214b88e393233e3.zip hardware_ti_omap4xxx-4a35937fcb950ccd05af56c49214b88e393233e3.tar.gz hardware_ti_omap4xxx-4a35937fcb950ccd05af56c49214b88e393233e3.tar.bz2 | |
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 'domx')
| -rw-r--r-- | domx/domx/omx_proxy_common/src/omx_proxy_common.c | 2 | ||||
| -rw-r--r-- | domx/omx_proxy_component/Android.mk | 3 | ||||
| -rwxr-xr-x | domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/domx/domx/omx_proxy_common/src/omx_proxy_common.c b/domx/domx/omx_proxy_common/src/omx_proxy_common.c index 60507c6..3014bf1 100644 --- a/domx/domx/omx_proxy_common/src/omx_proxy_common.c +++ b/domx/domx/omx_proxy_common/src/omx_proxy_common.c @@ -75,7 +75,7 @@ #ifdef USE_ION #include <unistd.h> -#include <ion/ion.h> +#include <ion.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/eventfd.h> diff --git a/domx/omx_proxy_component/Android.mk b/domx/omx_proxy_component/Android.mk index 58eb424..7931962 100644 --- a/domx/omx_proxy_component/Android.mk +++ b/domx/omx_proxy_component/Android.mk @@ -70,6 +70,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/../omx_core/inc \ $(LOCAL_PATH)/../mm_osal/inc \ $(LOCAL_PATH)/../domx \ + $(HARDWARE_TI_OMAP4_BASE)/ion/ \ $(LOCAL_PATH)/../domx/omx_rpc/inc LOCAL_SHARED_LIBRARIES := \ @@ -77,7 +78,7 @@ LOCAL_SHARED_LIBRARIES := \ libc \ libOMX_Core \ liblog \ - libion \ + libion_ti \ libdomx LOCAL_CFLAGS += -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER diff --git a/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c b/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c index 50ac002..729c190 100755 --- a/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c +++ b/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c @@ -74,7 +74,7 @@ #ifdef USE_ION #include <unistd.h> -#include <ion/ion.h> +#include <ion.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/eventfd.h> |