diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-01 08:23:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-01 08:23:50 +0000 |
| commit | 37063a42aa399e52a7316a6874db9389ab355bf8 (patch) | |
| tree | 4aba39348273730bfdcf2229e542f0e37b7c31cf | |
| parent | a83b9449d64f8cac276b5bccf5dc3fb25ec31a57 (diff) | |
| parent | b1d46b55398885f2ed8442fff842119f2b30f72a (diff) | |
| download | camera-37063a42aa399e52a7316a6874db9389ab355bf8.tar.gz | |
Snap for 4628106 from b1d46b55398885f2ed8442fff842119f2b30f72a to pi-release
Change-Id: I62d7a2524bff5ffd00cbeabfccabcbdc4f3b97bd
9 files changed, 14 insertions, 1 deletions
diff --git a/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h b/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h index 8f7babe..d9ba03a 100644 --- a/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h +++ b/msm8998/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/msm8998/QCamera2/stack/mm-camera-test/Android.mk b/msm8998/QCamera2/stack/mm-camera-test/Android.mk index a4e4a98..a4a2b51 100644 --- a/msm8998/QCamera2/stack/mm-camera-test/Android.mk +++ b/msm8998/QCamera2/stack/mm-camera-test/Android.mk @@ -93,6 +93,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) LOCAL_MODULE:= mm-qcamera-app +LOCAL_PROPRIETARY_MODULE := true include $(BUILD_EXECUTABLE) @@ -187,6 +188,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) LOCAL_MODULE:= libmm-qcamera +LOCAL_PROPRIETARY_MODULE := true include $(BUILD_SHARED_LIBRARY) diff --git a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c index bb044f8..2d55dcf 100755 --- a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c +++ b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c @@ -34,6 +34,8 @@ #include <dlfcn.h> #include <errno.h> #include <fcntl.h> +#include <sys/ioctl.h> +#include <unistd.h> #include <linux/msm_ion.h> #define MMAN_H <SYSTEM_HEADER_PREFIX/mman.h> #include MMAN_H diff --git a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c index edd9355..2e6e532 100755 --- a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c +++ b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c @@ -29,6 +29,7 @@ // System dependencies #include <ctype.h> #include <errno.h> +#include <unistd.h> // Camera dependencies #include "mm_qcamera_main_menu.h" diff --git a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c index 056106f..93a28e4 100644 --- a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c +++ b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c @@ -31,6 +31,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <assert.h> #include <errno.h> #include <fcntl.h> +#include <sys/ioctl.h> +#include <unistd.h> #define MMAN_H <SYSTEM_HEADER_PREFIX/mman.h> #include MMAN_H #include <cutils/properties.h> diff --git a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c index 5d52241..2ca1dca 100644 --- a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c +++ b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c @@ -29,6 +29,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // System dependencies #include <fcntl.h> +#include <unistd.h> // Camera dependencies #include "mm_qcamera_app.h" diff --git a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c index 81c377f..6628edb 100644 --- a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c +++ b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c @@ -31,6 +31,7 @@ #include <errno.h> #include <sys/socket.h> #include <fcntl.h> +#include <unistd.h> // Camera dependencies #include "mm_qcamera_socket.h" diff --git a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c index 78fd424..2618e16 100644 --- a/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c +++ b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c @@ -31,6 +31,8 @@ #include "mm_qcamera_app.h" #include "mm_qcamera_dbg.h" +#include <unistd.h> + #define MM_QCAMERA_APP_UTEST_MAX_MAIN_LOOP 1 #define MM_QCAMERA_APP_UTEST_OUTER_LOOP 1 #define MM_QCAMERA_APP_UTEST_INNER_LOOP 1 diff --git a/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk index 74c5a5c..10de9fe 100644 --- a/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk +++ b/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk @@ -47,6 +47,7 @@ LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) LOCAL_MODULE := mm-jpeg-interface-test LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libcutils libdl liblog libmmjpeg_interface +LOCAL_PROPRIETARY_MODULE := true include $(BUILD_EXECUTABLE) @@ -90,6 +91,7 @@ LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) LOCAL_MODULE := mm-jpegdec-interface-test LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libcutils libdl liblog libmmjpeg_interface +LOCAL_PROPRIETARY_MODULE := true include $(BUILD_EXECUTABLE) |