Switched to use header files from /frameworks/native
o related-to-bug: 6044887
Change-Id: If4a56cd53bf910d2db7a30e836bdafb7837bdba4
diff --git a/libcamera/Android.mk b/libcamera/Android.mk
index 1ade091..58020f0 100644
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -9,6 +9,7 @@
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libs3cjpeg
+LOCAL_C_INCLUDES += frameworks/native/include/media/hardware
LOCAL_SRC_FILES:= \
SecCamera.cpp SecCameraHWInterface.cpp
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp
index 40ba50d..5907f34 100755
--- a/libcamera/SecCameraHWInterface.cpp
+++ b/libcamera/SecCameraHWInterface.cpp
@@ -25,7 +25,7 @@
#include <fcntl.h>
#include <sys/mman.h>
#include <camera/Camera.h>
-#include <media/stagefright/MetadataBufferType.h>
+#include <MetadataBufferType.h>
#define VIDEO_COMMENT_MARKER_H 0xFFBE
#define VIDEO_COMMENT_MARKER_L 0xFFBF
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 3598451..052050c 100644
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -9,7 +9,8 @@
LOCAL_CFLAGS += $(PV_CFLAGS_MINUS_VISIBILITY)
LOCAL_C_INCLUDES:= \
- $(TOP)/frameworks/base/include/media/stagefright/openmax \
+ $(TOP)/frameworks/native/include/media/openmax \
+ $(TOP)/frameworks/native/include/media/hardware \
$(LOCAL_PATH)/../include \
LOCAL_SHARED_LIBRARIES := \
diff --git a/libstagefrighthw/SEC_OMX_Plugin.cpp b/libstagefrighthw/SEC_OMX_Plugin.cpp
index 82497aa..8347c63 100644
--- a/libstagefrighthw/SEC_OMX_Plugin.cpp
+++ b/libstagefrighthw/SEC_OMX_Plugin.cpp
@@ -18,7 +18,7 @@
#include <dlfcn.h>
-#include <media/stagefright/HardwareAPI.h>
+#include <HardwareAPI.h>
namespace android {
diff --git a/libstagefrighthw/SEC_OMX_Plugin.h b/libstagefrighthw/SEC_OMX_Plugin.h
index 6df2d31..3d640db 100644
--- a/libstagefrighthw/SEC_OMX_Plugin.h
+++ b/libstagefrighthw/SEC_OMX_Plugin.h
@@ -18,7 +18,7 @@
#define SEC_OMX_PLUGIN
-#include <media/stagefright/OMXPluginBase.h>
+#include <OMXPluginBase.h>
namespace android {
diff --git a/sec_mm/sec_omx/sec_osal/Android.mk b/sec_mm/sec_omx/sec_osal/Android.mk
index 7076472..00abe9f 100644
--- a/sec_mm/sec_omx/sec_osal/Android.mk
+++ b/sec_mm/sec_omx/sec_osal/Android.mk
@@ -33,6 +33,7 @@
$(SEC_OMX_INC)/sec \
$(SEC_OMX_TOP)/sec_osal \
$(SEC_OMX_COMPONENT)/common \
- $(SEC_OMX_TOP)/../../include
+ $(SEC_OMX_TOP)/../../include \
+ $(TOP)/frameworks/native/include/media/hardware
include $(BUILD_STATIC_LIBRARY)
diff --git a/sec_mm/sec_omx/sec_osal/SEC_OSAL_Buffer.cpp b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Buffer.cpp
index e4aa8bc..c92ac18 100644
--- a/sec_mm/sec_omx/sec_osal/SEC_OSAL_Buffer.cpp
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Buffer.cpp
@@ -50,9 +50,9 @@
#include <ui/GraphicBuffer.h>
#include <ui/GraphicBufferMapper.h>
#include <ui/Rect.h>
-#include <media/stagefright/HardwareAPI.h>
+#include <HardwareAPI.h>
#include <hardware/hardware.h>
-#include <media/stagefright/MetadataBufferType.h>
+#include <MetadataBufferType.h>
#include "hal_public.h"
#define HAL_PIXEL_FORMAT_C110_NV12 0x100
