aboutsummaryrefslogtreecommitdiff
path: root/camera/QCamera2/stack
diff options
context:
space:
mode:
Diffstat (limited to 'camera/QCamera2/stack')
-rw-r--r--camera/QCamera2/stack/common/cam_list.h1
-rw-r--r--camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h2
-rw-r--r--camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c2
-rw-r--r--camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk4
4 files changed, 6 insertions, 3 deletions
diff --git a/camera/QCamera2/stack/common/cam_list.h b/camera/QCamera2/stack/common/cam_list.h
index 0fbfa07..a165262 100644
--- a/camera/QCamera2/stack/common/cam_list.h
+++ b/camera/QCamera2/stack/common/cam_list.h
@@ -33,6 +33,7 @@
#ifndef __CAMLIST_H
#define __CAMLIST_H
+#include <stddef.h>
// System dependency
#include <stdlib.h>
diff --git a/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h b/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
index 971ae74..fd1c72f 100644
--- a/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
+++ b/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
@@ -34,7 +34,7 @@
#include <poll.h>
// Camera dependencies
-#include "camera_common.h"
+#include "hardware/camera_common.h"
#include "cam_semaphore.h"
#include "mm_camera_interface.h"
diff --git a/camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c b/camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
index 7ab8db8..81c377f 100644
--- a/camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
+++ b/camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
@@ -29,6 +29,8 @@
// System dependencies
#include <errno.h>
+#include <sys/socket.h>
+#include <fcntl.h>
// Camera dependencies
#include "mm_qcamera_socket.h"
diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
index b42636c..a15c158 100644
--- a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
+++ b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
@@ -19,7 +19,7 @@ endif
LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys
OMX_HEADER_DIR := frameworks/native/include/media/openmax
-OMX_CORE_DIR := hardware/qcom/camera/mm-image-codec
+OMX_CORE_DIR := $(MM_JPEG_TEST_PATH)/../../../../mm-image-codec
LOCAL_C_INCLUDES := $(MM_JPEG_TEST_PATH)
LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc
@@ -62,7 +62,7 @@ endif
LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys
OMX_HEADER_DIR := frameworks/native/include/media/openmax
-OMX_CORE_DIR := hardware/qcom/camera/mm-image-codec
+OMX_CORE_DIR := $(MM_JPEG_TEST_PATH)/../../../../mm-image-codec
LOCAL_C_INCLUDES := $(MM_JPEG_TEST_PATH)
LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc