diff options
| author | Jiyong Park <jiyong@google.com> | 2018-01-26 15:52:02 +0900 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-09-26 15:22:06 +0200 |
| commit | 1a9e25c369293c99a6900e9daecc691b1ee5946d (patch) | |
| tree | c1bec191558d58819af04dfc39d177798cbd531e | |
| parent | 28a157af5502058767010dd55cb362cf6fd5c95a (diff) | |
Make QCamera2 modules build with VNDK
- unistd.h added for close, write, etc.
- libsystem_headers, libhardware_headers added because global include
path isn't provided when building with vndk
Bug: 69526027
Test: mma -j under QCamera2
Change-Id: Id3b59c12a89120cc7e378e873bb663926d3bd45e
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
3 files changed, 3 insertions, 2 deletions
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index 323618f..c3c9f8f 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -55,7 +55,7 @@ LOCAL_SRC_FILES := $(MM_CAM_FILES) LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libutils -LOCAL_HEADER_LIBRARIES := libhardware_headers +LOCAL_HEADER_LIBRARIES := libsystem_headers libhardware_headers LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true diff --git a/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h b/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h index 8298c78..682cf95 100644 --- a/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h +++ b/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h @@ -31,7 +31,7 @@ #define __MM_CAMERA_DBG_H__ // System dependencies -#include <utils/Log.h> +#include <log/log.h> #ifdef QCAMERA_REDEFINE_LOG diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_thread.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_thread.c index 9395bad..d19e37b 100644 --- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_thread.c +++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_thread.c @@ -37,6 +37,7 @@ #include <unistd.h> #include <fcntl.h> #include <poll.h> +#include <unistd.h> // for write, read, usleep, pipe, ... #include <cam_semaphore.h> #include "mm_camera_dbg.h" |