diff options
| author | Dan Liang <dan.liang@intel.com> | 2013-06-17 11:27:54 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:41 -0700 |
| commit | 5ab2f45a95344b12cad43f277a730c8679b42171 (patch) | |
| tree | e9ed41a199be93eb8de01a9bfda963cda57350a8 /Android.mk | |
| parent | fa824cac36baf4f5377f65a996a615b90c1558af (diff) | |
| download | wrs_omxil_core-5ab2f45a95344b12cad43f277a730c8679b42171.tar.gz | |
[PDK MR2 ABSP] remove duplicate omx header file between khronos and google framework
BZ: 117349
khronos omx will reference google framework to avoid conflict causing by the
inconformity, the conflict will cause video record doesnot work in PDK
Change-Id: I6762f097e91a47ba820d03923d6141311de53ff6
Signed-off-by: ywan171 <yi.a.wang@intel.com>
Signed-off-by: Dan Liang <dan.liang@intel.com>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -4,20 +4,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_COPY_HEADERS_TO := khronos/openmax + LOCAL_COPY_HEADERS := \ - core/inc/khronos/openmax/include/OMX_Audio.h \ - core/inc/khronos/openmax/include/OMX_Component.h \ - core/inc/khronos/openmax/include/OMX_ContentPipe.h \ - core/inc/khronos/openmax/include/OMX_Core.h \ - core/inc/khronos/openmax/include/OMX_IVCommon.h \ - core/inc/khronos/openmax/include/OMX_Image.h \ - core/inc/khronos/openmax/include/OMX_Index.h \ - core/inc/khronos/openmax/include/OMX_IndexExt.h \ core/inc/khronos/openmax/include/OMX_IntelErrorTypes.h \ - core/inc/khronos/openmax/include/OMX_Other.h \ - core/inc/khronos/openmax/include/OMX_Types.h \ - core/inc/khronos/openmax/include/OMX_Video.h \ - core/inc/khronos/openmax/include/OMX_VideoExt.h + core/inc/khronos/openmax/include/OMX_IntelIndexExt.h \ + core/inc/khronos/openmax/include/OMX_IntelVideoExt.h + include $(BUILD_COPY_HEADERS) include $(CLEAR_VARS) |