diff options
| author | Daniel Levin <dendy@ti.com> | 2012-10-04 15:51:41 +0300 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-19 21:48:09 +0200 |
| commit | 9879519fb9fb873c7fff6db2e1a44112811505d2 (patch) | |
| tree | fc883c94cb233a47608696a6e9935a5a0a504dea /domx | |
| parent | 1307c3a722d05441f561cc26ea022b63578f4740 (diff) | |
| download | hardware_ti_omap4-9879519fb9fb873c7fff6db2e1a44112811505d2.zip hardware_ti_omap4-9879519fb9fb873c7fff6db2e1a44112811505d2.tar.gz hardware_ti_omap4-9879519fb9fb873c7fff6db2e1a44112811505d2.tar.bz2 | |
Use ion_ti instead of ion
Since Google approach is to have own ion library in parallel with TI
ion library, latter has been renamed to ion_ti in JB MR1 and moved into
hardware/ti/omap4xxx together with kernel headers.
This patch fixes inclusion of ion library from <ion_ti/ion.h> and
linking to libion_ti appropriately.
Change-Id: Ibea0d45b013a49310d75c77561724add4ee01999
Signed-off-by: Daniel Levin <dendy@ti.com>
Diffstat (limited to 'domx')
| -rw-r--r-- | domx/Android.mk | 2 | ||||
| -rw-r--r-- | domx/omx_proxy_common/src/omx_proxy_common.c | 2 | ||||
| -rwxr-xr-x | domx/plugins/inc/memplugin_ion.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/domx/Android.mk b/domx/Android.mk index 143d7eb..66c90b9 100644 --- a/domx/Android.mk +++ b/domx/Android.mk @@ -32,7 +32,7 @@ LOCAL_SHARED_LIBRARIES := \ libmm_osal \ libc \ liblog \ - libion \ + libion_ti \ libcutils LOCAL_MODULE:= libdomx diff --git a/domx/omx_proxy_common/src/omx_proxy_common.c b/domx/omx_proxy_common/src/omx_proxy_common.c index 2de8668..1abf1eb 100644 --- a/domx/omx_proxy_common/src/omx_proxy_common.c +++ b/domx/omx_proxy_common/src/omx_proxy_common.c @@ -75,7 +75,7 @@ #ifdef ALLOCATE_TILER_BUFFER_IN_PROXY #ifdef USE_ION #include <unistd.h> -#include <ion/ion.h> +#include <ion_ti/ion.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/eventfd.h> diff --git a/domx/plugins/inc/memplugin_ion.h b/domx/plugins/inc/memplugin_ion.h index bde12b2..9e5b4a5 100755 --- a/domx/plugins/inc/memplugin_ion.h +++ b/domx/plugins/inc/memplugin_ion.h @@ -38,7 +38,7 @@ */ #include <unistd.h> -#include <ion/ion.h> +#include <ion_ti/ion.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/eventfd.h> |