diff options
| author | Mathias Agopian <mathias@google.com> | 2017-05-01 17:29:52 -0700 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-07-12 22:42:08 +0200 |
| commit | 125d24e80e0d9cf97d0e885385261455d3630f7c (patch) | |
| tree | b3868c3dba8b6613c74477a576a4df0a8488b09f | |
| parent | 9e9c92da38b4853a5c161bedd543c204831f5019 (diff) | |
| download | android_hardware_qcom_media-125d24e80e0d9cf97d0e885385261455d3630f7c.tar.gz android_hardware_qcom_media-125d24e80e0d9cf97d0e885385261455d3630f7c.tar.bz2 android_hardware_qcom_media-125d24e80e0d9cf97d0e885385261455d3630f7c.zip | |
fix circular dependency libnativewindow <-> libui
Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I7214dcc1e57f2a0466fc28173dd5de5d54c9a721
| -rw-r--r-- | libstagefrighthw/QComOMXMetadata.h | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h index e6b4579e..f349c457 100644 --- a/libstagefrighthw/QComOMXMetadata.h +++ b/libstagefrighthw/QComOMXMetadata.h @@ -18,7 +18,7 @@ #ifndef QCOM_OMX_METADATA_H_ #define QCOM_OMX_METADATA_H_ -#include <system/window.h> +#include <cutils/native_handle.h> #include <media/hardware/MetadataBufferType.h> namespace android { diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index a44f4264..38c7c2f3 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -54,6 +54,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <stdlib.h> #include <media/hardware/HardwareAPI.h> #include <sys/eventfd.h> +#include <nativebase/nativebase.h> #include "PlatformConfig.h" #if !defined(_ANDROID_) || defined(SYS_IOCTL) |