diff options
| author | Xiaolin Zhang <shuo.gao@intel.com> | 2012-07-13 21:44:36 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:47 -0700 |
| commit | 1be8a72c09dada58bec33d32c5da17dd27774bfa (patch) | |
| tree | 307b64a73de8af852db293ba38c33efd0f7d425e | |
| parent | c44c8d918afe5762207667fca28d4604d5de8d8e (diff) | |
| download | android_hardware_intel_common_omx-components-1be8a72c09dada58bec33d32c5da17dd27774bfa.tar.gz android_hardware_intel_common_omx-components-1be8a72c09dada58bec33d32c5da17dd27774bfa.tar.bz2 android_hardware_intel_common_omx-components-1be8a72c09dada58bec33d32c5da17dd27774bfa.zip | |
[omx-components] fixed JB build issue by updating hardware.h path and disable secure AVC feature.
BZ: 47236
fixed JB build issue by updating hardware.h path and disable
secure AVC feature.
Change-Id: Ia25b1e62919010f097720e1d0b2f3d2e0f89aead
Signed-off-by: Xiaolin Zhang <xiaolin.zhang@intel.com>
Reviewed-on: http://android.intel.com:8080/56586
Reviewed-by: Beare, Bruce J <bruce.j.beare@intel.com>
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | videocodec/Android.mk | 40 | ||||
| -rw-r--r-- | videocodec/OMXComponentCodecBase.h | 5 |
3 files changed, 31 insertions, 16 deletions
@@ -1,4 +1,4 @@ -ifeq ($(strip $(BOARD_USES_MRST_OMX)),true) +ifeq ($(BOARD_USES_MRST_OMX),true) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) diff --git a/videocodec/Android.mk b/videocodec/Android.mk index ac64cee..13e0409 100644 --- a/videocodec/Android.mk +++ b/videocodec/Android.mk @@ -19,7 +19,9 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ - $(TARGET_OUT_HEADERS)/libva + $(TARGET_OUT_HEADERS)/libva \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp\ @@ -48,7 +50,9 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ - $(TARGET_OUT_HEADERS)/libva + $(TARGET_OUT_HEADERS)/libva \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp\ @@ -76,7 +80,9 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ - $(TARGET_OUT_HEADERS)/libva + $(TARGET_OUT_HEADERS)/libva \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp\ @@ -105,7 +111,9 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ - $(TARGET_OUT_HEADERS)/libva + $(TARGET_OUT_HEADERS)/libva \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp\ @@ -136,7 +144,9 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ $(TARGET_OUT_HEADERS)/libva \ - $(TARGET_OUT_HEADERS)/libsharedbuffer + $(TARGET_OUT_HEADERS)/libsharedbuffer \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp \ @@ -168,7 +178,9 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ $(TARGET_OUT_HEADERS)/libva \ - $(TARGET_OUT_HEADERS)/libsharedbuffer + $(TARGET_OUT_HEADERS)/libsharedbuffer \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp \ @@ -199,7 +211,9 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ $(TARGET_OUT_HEADERS)/libva \ - $(TARGET_OUT_HEADERS)/libsharedbuffer + $(TARGET_OUT_HEADERS)/libsharedbuffer \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp \ @@ -227,7 +241,9 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ - $(TARGET_OUT_HEADERS)/libva + $(TARGET_OUT_HEADERS)/libva \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp\ @@ -250,7 +266,7 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libva \ libva-android \ - libsepdrm +# libsepdrm LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/wrs_omxil_core \ @@ -258,12 +274,14 @@ LOCAL_C_INCLUDES := \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ $(TARGET_OUT_HEADERS)/libva \ - $(TARGET_OUT_HEADERS)/libsepdrm + $(TARGET_OUT_HEADERS)/libsepdrm \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp\ OMXVideoDecoderBase.cpp\ - OMXVideoDecoderAVCSecure.cpp +# OMXVideoDecoderAVCSecure.cpp LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libOMXVideoDecoderAVCSecure diff --git a/videocodec/OMXComponentCodecBase.h b/videocodec/OMXComponentCodecBase.h index 81b7daf..cf87c41 100644 --- a/videocodec/OMXComponentCodecBase.h +++ b/videocodec/OMXComponentCodecBase.h @@ -30,10 +30,7 @@ #include <componentbase.h> #include "OMXComponentDefines.h" -#include <media/stagefright/HardwareAPI.h> - - - +#include <HardwareAPI.h> class OMXComponentCodecBase : public ComponentBase { public: |