summaryrefslogtreecommitdiffstats
path: root/libcamera
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-03-12 13:42:28 -0700
committerJames Dong <jdong@google.com>2012-03-12 20:38:08 -0700
commit8174ff45beba26d5f82bea0aa95177f47a39339e (patch)
tree1fce228b61d6ac701ab909d6097a68b44bd10fe6 /libcamera
parentc9316f02e09f2aead4b6ca056c60c0764c00c63e (diff)
downloaddevice_samsung_crespo-8174ff45beba26d5f82bea0aa95177f47a39339e.zip
device_samsung_crespo-8174ff45beba26d5f82bea0aa95177f47a39339e.tar.gz
device_samsung_crespo-8174ff45beba26d5f82bea0aa95177f47a39339e.tar.bz2
Switched to use header files from /frameworks/native
o related-to-bug: 6044887 Change-Id: If4a56cd53bf910d2db7a30e836bdafb7837bdba4
Diffstat (limited to 'libcamera')
-rw-r--r--libcamera/Android.mk1
-rwxr-xr-xlibcamera/SecCameraHWInterface.cpp2
2 files changed, 2 insertions, 1 deletions
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_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
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