diff options
| author | Elaine Wang <elaine.wang@intel.com> | 2013-11-14 23:26:49 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:55 -0700 |
| commit | 46f8afda66035563f07829af85b45b2c992969ef (patch) | |
| tree | af615497fb20087d3802125e953b4db4fe65f3b4 | |
| parent | 65c861a00bba638df5ba214b25605f0390a53bfe (diff) | |
| download | android_hardware_intel_common_omx-components-46f8afda66035563f07829af85b45b2c992969ef.tar.gz android_hardware_intel_common_omx-components-46f8afda66035563f07829af85b45b2c992969ef.tar.bz2 android_hardware_intel_common_omx-components-46f8afda66035563f07829af85b45b2c992969ef.zip | |
Remove direct dependencies to linux/modules/intel_media
BZ: 152015
There are some direct references to
linux/modules/intel_media/common/psb_drm.h. This means that if
intel_media directory is moved elsewhere, it breaks the build.
Refer to the psb_drm.h under device/intel/common/kernel-headers/linux
instead. If developer modify the psb_drm.h file in kernel, he should
make the same change to the one in kernel-headers as well.
Change-Id: I9b6dda7a6a31a62a4b902e739057831071837a88
Signed-off-by: Elaine Wang <elaine.wang@intel.com>
| -rw-r--r-- | videocodec/Android.mk | 9 | ||||
| -rw-r--r-- | videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp | 2 | ||||
| -rw-r--r-- | videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/videocodec/Android.mk b/videocodec/Android.mk index 03635a0..c16aa26 100644 --- a/videocodec/Android.mk +++ b/videocodec/Android.mk @@ -250,7 +250,6 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/libttm \ $(call include-path-for, frameworks-native)/media/hardware \ $(call include-path-for, frameworks-native)/media/openmax \ - $(TOP)/linux/modules/intel_media/common LOCAL_SRC_FILES := \ OMXComponentCodecBase.cpp\ @@ -317,7 +316,7 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/wrs_omxil_core \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ - $(TARGET_OUT_HEADERS)/libva \ + $(TARGET_OUT_HEADERS)/libva \ $(call include-path-for, frameworks-native)/media/hardware \ $(call include-path-for, frameworks-native)/media/openmax \ @@ -355,7 +354,7 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/wrs_omxil_core \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ - $(TARGET_OUT_HEADERS)/libva \ + $(TARGET_OUT_HEADERS)/libva \ $(call include-path-for, frameworks-native)/media/hardware \ $(call include-path-for, frameworks-native)/media/openmax \ @@ -396,7 +395,7 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/wrs_omxil_core \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ - $(TARGET_OUT_HEADERS)/libva \ + $(TARGET_OUT_HEADERS)/libva \ $(call include-path-for, frameworks-native)/media/hardware \ $(call include-path-for, frameworks-native)/media/openmax \ @@ -473,7 +472,7 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/wrs_omxil_core \ $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ - $(TARGET_OUT_HEADERS)/libva \ + $(TARGET_OUT_HEADERS)/libva \ $(call include-path-for, frameworks-native)/media/hardware \ $(call include-path-for, frameworks-native)/media/openmax \ diff --git a/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp index 37ac5f4..abaf120 100644 --- a/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp +++ b/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp @@ -26,7 +26,7 @@ extern "C" { #include <sepdrm.h> #include <fcntl.h> -#include "psb_drm.h" +#include <linux/psb_drm.h> #include "xf86drm.h" #include "xf86drmMode.h" } diff --git a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp index b6a96d4..590c9ea 100644 --- a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp +++ b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp @@ -26,7 +26,7 @@ extern "C" { #include <sepdrm.h> #include <fcntl.h> -#include "psb_drm.h" +#include <linux/psb_drm.h> #include "xf86drm.h" #include "xf86drmMode.h" } |