mm-video : Switch back to ion.h from kernel sources.

- Also, use kernel header files exported from kernel sources for vdec and venc. Change-Id: I18597074094dd6d5c1dbeed7987e307a73246552 Conflicts: mm-video/vidc/venc/Android.mk
vwmofo · Jul 27, 2012 · 5ea4495 · 5ea4495
1 parent cd95c3d
commit 5ea4495
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/mm-video/vidc/vdec/inc/omx_vdec.h b/mm-video/vidc/vdec/inc/omx_vdec.h
@@ -58,7 +58,7 @@ static ptrdiff_t x;
 #endif
 
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 //#include <linux/ion.h> //TBD - uncomment this
 //#include <binder/MemoryHeapIon.h>
 //#else

diff --git a/mm-video/vidc/venc/inc/omx_video_common.h b/mm-video/vidc/venc/inc/omx_video_common.h
@@ -35,7 +35,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include<stdlib.h>
 #include <stdio.h>
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 #endif
 
 #define OMX_VIDEO_DEC_NUM_INPUT_BUFFERS   2

diff --git a/mm-video/vidc/venc/src/video_encoder_device.cpp b/mm-video/vidc/venc/src/video_encoder_device.cpp
@@ -34,7 +34,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "omx_video_encoder.h"
 #include <linux/android_pmem.h>
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 #endif
 
 #define MPEG4_SP_START 0

diff --git a/mm-video/vidc/venc/src/video_encoder_device_msm8974.cpp b/mm-video/vidc/venc/src/video_encoder_device_msm8974.cpp
@@ -34,7 +34,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "omx_video_encoder.h"
 #include <linux/android_pmem.h>
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 #endif
 
 #define MPEG4_SP_START 0

diff --git a/mm-video/vidc/venc/test/venc_test.cpp b/mm-video/vidc/venc/test/venc_test.cpp
@@ -68,7 +68,7 @@ REFERENCES
 #include "venc_util.h"
 #include "extra_data_handler.h"
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 #endif
 
 //////////////////////////