diff options
| author | Daniel Levin <dendy@ti.com> | 2012-07-28 15:35:25 -0500 |
|---|---|---|
| committer | Sejal Barot <sejal@ti.com> | 2012-08-28 09:50:08 +0530 |
| commit | 49525b67acff5ae1339fb4594a1a53989b919310 (patch) | |
| tree | 39dd1c19bea7489b71f2805932567a1cde01779a /domx | |
| parent | a85a99838c4e4fd256eac5f7e3d3b733a1f3394d (diff) | |
| download | hardware_ti_omap4-49525b67acff5ae1339fb4594a1a53989b919310.zip hardware_ti_omap4-49525b67acff5ae1339fb4594a1a53989b919310.tar.gz hardware_ti_omap4-49525b67acff5ae1339fb4594a1a53989b919310.tar.bz2 | |
Include ION headers from <ion/ion.h>
Reconciling with JB ION headers inclusion style.
The ION headers should be included from <ion/ion.h> to avoid ambiguity.
Depends on: http://review.omapzoom.org/#/c/23883/
Change-Id: Ie0c93f5b03b67660825ca3ed77af6ca1ceb7fc3e
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 |
2 files changed, 2 insertions, 2 deletions
diff --git a/domx/Android.mk b/domx/Android.mk index b3e9c68..8a645af 100644 --- a/domx/Android.mk +++ b/domx/Android.mk @@ -17,7 +17,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/../mm_osal/inc \ $(LOCAL_PATH)/profiling/inc \ $(HARDWARE_TI_OMAP4_BASE)/hwc/ \ - $(HARDWARE_TI_OMAP4_BASE)/ion/ \ + $(HARDWARE_TI_OMAP4_BASE)/include/ \ system/core/include/cutils \ $(HARDWARE_TI_OMAP4_BASE)/../../libhardware/include diff --git a/domx/omx_proxy_common/src/omx_proxy_common.c b/domx/omx_proxy_common/src/omx_proxy_common.c index a976f3d..77b617c 100644 --- a/domx/omx_proxy_common/src/omx_proxy_common.c +++ b/domx/omx_proxy_common/src/omx_proxy_common.c @@ -76,7 +76,7 @@ #ifdef USE_ION #include <unistd.h> -#include <ion.h> +#include <ion/ion.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/eventfd.h> |