From 89d7a112547f55292e1dd99c61c022ff6669cd0a Mon Sep 17 00:00:00 2001 From: Sauhard Pande Date: Mon, 3 Apr 2017 19:24:59 +0530 Subject: msm8996-common: camera: Vendor Seperation Moving camera hal and mm-interface binaries to /system/vendor/lib Change-Id: Ic639b698a8bf4418d51409342ab8f1187362a99b --- camera/QCamera2/Android.mk | 1 + camera/QCamera2/stack/mm-camera-interface/Android.mk | 1 + camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 1 + camera/QCamera2/stack/mm-lib2d-interface/Android.mk | 1 + 4 files changed, 4 insertions(+) (limited to 'camera') diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index f101f75..358b04d 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -116,6 +116,7 @@ LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index 169c1cf..a928805 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -56,6 +56,7 @@ LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index 175796b..cba41d8 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -75,6 +75,7 @@ ifeq ($(strip $(LIB2D_ROTATION)),true) LOCAL_SHARED_LIBRARIES += libmmlib2d_interface endif LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk index 696f04a..4d3d31d 100644 --- a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk +++ b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk @@ -32,6 +32,7 @@ LOCAL_MODULE := libmmlib2d_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libmmcamera_interface LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3 From 2bfb61bf2a3a92d9fccdcc0d8bd65c6a9e8cbe8b Mon Sep 17 00:00:00 2001 From: Suman Mukherjee Date: Thu, 6 Jul 2017 16:01:18 +0530 Subject: msm8996-common: camera: Added LOCAL_VENDOR_MODULE to set output path of the binaries Replaced LOCAL_PROPRIETARY_MODULE with LOCAL_VENDOR_MODULE to set the output vendor path for hal binaries and libraries Change-Id: Ib04d80eabc0e17f3863e956db5f2378e426c0687 --- camera/QCamera2/Android.mk | 2 +- camera/QCamera2/stack/mm-camera-interface/Android.mk | 2 +- camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 2 +- camera/QCamera2/stack/mm-lib2d-interface/Android.mk | 2 +- camera/mm-image-codec/qomx_core/Android.mk | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) (limited to 'camera') diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 358b04d..2487561 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -116,7 +116,7 @@ LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index a928805..22e4509 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -56,7 +56,7 @@ LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index cba41d8..8dd448d 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -75,7 +75,7 @@ ifeq ($(strip $(LIB2D_ROTATION)),true) LOCAL_SHARED_LIBRARIES += libmmlib2d_interface endif LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk index 4d3d31d..e963b69 100644 --- a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk +++ b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk @@ -32,7 +32,7 @@ LOCAL_MODULE := libmmlib2d_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libmmcamera_interface LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/mm-image-codec/qomx_core/Android.mk b/camera/mm-image-codec/qomx_core/Android.mk index c4edfc4..9f46202 100644 --- a/camera/mm-image-codec/qomx_core/Android.mk +++ b/camera/mm-image-codec/qomx_core/Android.mk @@ -20,6 +20,7 @@ LOCAL_SRC_FILES := qomx_core.c LOCAL_MODULE := libqomx_core LOCAL_PRELINK_MODULE := false +LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := libcutils libdl liblog LOCAL_32_BIT_ONLY := true -- cgit v1.2.3 From 9c51d07b50544dff993f498fdc2addd26267d94b Mon Sep 17 00:00:00 2001 From: Lida Wang Date: Fri, 24 Mar 2017 18:11:28 -0700 Subject: msm8996-common: camera: HAL1: fix HAL1 callback cookie 1. fix HAL1 memory callback cookie for Treble change 2. remove checking for VANILLA_HAL definition for O upgrade now for initial bring up, until the removal of the TARGET_USE_AOSP flag in devie mkfile. Change-Id: Iedf5a97e9890bc7216a3008373ddef5005836a01 --- camera/QCamera2/HAL/QCamera2HWI.cpp | 18 +++++++++++------- camera/QCamera2/HAL/QCameraMem.cpp | 29 +++++++++++++++-------------- camera/QCamera2/HAL/QCameraMem.h | 9 ++++++--- 3 files changed, 32 insertions(+), 24 deletions(-) (limited to 'camera') diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp index bc97c07..7066805 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.cpp +++ b/camera/QCamera2/HAL/QCamera2HWI.cpp @@ -2715,14 +2715,16 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( { if (isNoDisplayMode()) { mem = new QCameraStreamMemory(mGetMemory, + mCallbackCookie, bCachedMem, (bPoolMem) ? &m_memoryPool : NULL, stream_type); } else { cam_dimension_t dim; int minFPS, maxFPS; - QCameraGrallocMemory *grallocMemory = - new QCameraGrallocMemory(mGetMemory); + QCameraGrallocMemory *grallocMemory = NULL; + + grallocMemory = new QCameraGrallocMemory(mGetMemory, mCallbackCookie); mParameters.getStreamDimension(stream_type, dim); /* we are interested only in maxfps here */ @@ -2758,12 +2760,12 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( case CAM_STREAM_TYPE_POSTVIEW: { if (isNoDisplayMode() || isPreviewRestartEnabled()) { - mem = new QCameraStreamMemory(mGetMemory, bCachedMem); + mem = new QCameraStreamMemory(mGetMemory, mCallbackCookie, bCachedMem); } else { cam_dimension_t dim; int minFPS, maxFPS; QCameraGrallocMemory *grallocMemory = - new QCameraGrallocMemory(mGetMemory); + new QCameraGrallocMemory(mGetMemory, mCallbackCookie); mParameters.getStreamDimension(stream_type, dim); /* we are interested only in maxfps here */ @@ -2782,6 +2784,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( case CAM_STREAM_TYPE_RAW: case CAM_STREAM_TYPE_OFFLINE_PROC: mem = new QCameraStreamMemory(mGetMemory, + mCallbackCookie, bCachedMem, (bPoolMem) ? &m_memoryPool : NULL, stream_type); @@ -2823,7 +2826,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( QCameraVideoMemory *videoMemory = NULL; if (mParameters.getVideoBatchSize()) { videoMemory = new QCameraVideoMemory( - mGetMemory, FALSE, QCAMERA_MEM_TYPE_BATCH); + mGetMemory, mCallbackCookie, FALSE, QCAMERA_MEM_TYPE_BATCH); if (videoMemory == NULL) { LOGE("Out of memory for video batching obj"); return NULL; @@ -2842,7 +2845,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( } } else { videoMemory = - new QCameraVideoMemory(mGetMemory, bCachedMem); + new QCameraVideoMemory(mGetMemory, mCallbackCookie, bCachedMem); if (videoMemory == NULL) { LOGE("Out of memory for video obj"); return NULL; @@ -2862,6 +2865,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( break; case CAM_STREAM_TYPE_CALLBACK: mem = new QCameraStreamMemory(mGetMemory, + mCallbackCookie, bCachedMem, (bPoolMem) ? &m_memoryPool : NULL, stream_type); @@ -3175,7 +3179,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamUserBuf( switch (streamInfo->stream_type) { case CAM_STREAM_TYPE_VIDEO: { QCameraVideoMemory *video_mem = new QCameraVideoMemory( - mGetMemory, FALSE, QCAMERA_MEM_TYPE_BATCH); + mGetMemory, mCallbackCookie, FALSE, QCAMERA_MEM_TYPE_BATCH); if (video_mem == NULL) { LOGE("Out of memory for video obj"); return NULL; diff --git a/camera/QCamera2/HAL/QCameraMem.cpp b/camera/QCamera2/HAL/QCameraMem.cpp index f4c239a..2502cf3 100755 --- a/camera/QCamera2/HAL/QCameraMem.cpp +++ b/camera/QCamera2/HAL/QCameraMem.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -1050,11 +1050,13 @@ int QCameraMetadataStreamMemory::getRegFlags(uint8_t *regFlags) const * RETURN : none *==========================================================================*/ QCameraStreamMemory::QCameraStreamMemory(camera_request_memory memory, + void* cbCookie, bool cached, QCameraMemoryPool *pool, cam_stream_type_t streamType, __unused cam_stream_buf_type bufType) :QCameraMemory(cached, pool, streamType), - mGetMemory(memory) + mGetMemory(memory), + mCallbackCookie(cbCookie) { for (int i = 0; i < MM_CAMERA_MAX_NUM_FRAMES; i ++) mCameraMemory[i] = NULL; @@ -1100,7 +1102,7 @@ int QCameraStreamMemory::allocate(uint8_t count, size_t size, uint32_t isSecure) if (isSecure == SECURE) { mCameraMemory[i] = 0; } else { - mCameraMemory[i] = mGetMemory(mMemInfo[i].fd, mMemInfo[i].size, 1, this); + mCameraMemory[i] = mGetMemory(mMemInfo[i].fd, mMemInfo[i].size, 1, mCallbackCookie); } } mBufferCount = count; @@ -1132,7 +1134,7 @@ int QCameraStreamMemory::allocateMore(uint8_t count, size_t size) } for (int i = mBufferCount; i < mBufferCount + count; i++) { - mCameraMemory[i] = mGetMemory(mMemInfo[i].fd, mMemInfo[i].size, 1, this); + mCameraMemory[i] = mGetMemory(mMemInfo[i].fd, mMemInfo[i].size, 1, mCallbackCookie); } mBufferCount = (uint8_t)(mBufferCount + count); ATRACE_END(); @@ -1280,9 +1282,9 @@ void *QCameraStreamMemory::getPtr(uint32_t index) const * * RETURN : none *==========================================================================*/ -QCameraVideoMemory::QCameraVideoMemory(camera_request_memory memory, +QCameraVideoMemory::QCameraVideoMemory(camera_request_memory memory, void* cbCookie, bool cached, QCameraMemType bufType) - : QCameraStreamMemory(memory, cached) + : QCameraStreamMemory(memory, cbCookie, cached) { memset(mMetadata, 0, sizeof(mMetadata)); memset(mNativeHandle, 0, sizeof(mNativeHandle)); @@ -1385,7 +1387,7 @@ int QCameraVideoMemory::allocateMore(uint8_t count, size_t size) if (!(mBufType & QCAMERA_MEM_TYPE_BATCH)) { for (int i = mBufferCount; i < count + mBufferCount; i ++) { mMetadata[i] = mGetMemory(-1, - sizeof(media_metadata_buffer), 1, this); + sizeof(media_metadata_buffer), 1, mCallbackCookie); if (!mMetadata[i]) { LOGE("allocation of video metadata failed."); for (int j = mBufferCount; j <= i-1; j ++) { @@ -1447,7 +1449,7 @@ int QCameraVideoMemory::allocateMeta(uint8_t buf_cnt, int numFDs, int numInts) for (int i = 0; i < buf_cnt; i++) { mMetadata[i] = mGetMemory(-1, - sizeof(media_metadata_buffer), 1, this); + sizeof(media_metadata_buffer), 1, mCallbackCookie); if (!mMetadata[i]) { LOGE("allocation of video metadata failed."); for (int j = (i - 1); j >= 0; j--) { @@ -1709,11 +1711,9 @@ int QCameraVideoMemory::convCamtoOMXFormat(cam_format_t format) case CAM_FORMAT_YUV_420_NV12_VENUS: omxFormat = OMX_COLOR_FormatYUV420SemiPlanar; break; -#ifndef VANILLA_HAL case CAM_FORMAT_YUV_420_NV12_UBWC: omxFormat = QOMX_COLOR_FORMATYUV420PackedSemiPlanar32mCompressed; break; -#endif default: omxFormat = OMX_COLOR_FormatYUV420SemiPlanar; } @@ -1731,7 +1731,7 @@ int QCameraVideoMemory::convCamtoOMXFormat(cam_format_t format) * * RETURN : none *==========================================================================*/ -QCameraGrallocMemory::QCameraGrallocMemory(camera_request_memory memory) +QCameraGrallocMemory::QCameraGrallocMemory(camera_request_memory memory, void* cbCookie) : QCameraMemory(true), mColorSpace(ITU_R_601_FR) { mMinUndequeuedBuffers = 0; @@ -1739,6 +1739,7 @@ QCameraGrallocMemory::QCameraGrallocMemory(camera_request_memory memory) mWindow = NULL; mWidth = mHeight = mStride = mScanline = mUsage = 0; mFormat = HAL_PIXEL_FORMAT_YCrCb_420_SP; + mCallbackCookie = cbCookie; mGetMemory = memory; for (int i = 0; i < MM_CAMERA_MAX_NUM_FRAMES; i ++) { mBufferHandle[i] = NULL; @@ -1889,7 +1890,7 @@ int QCameraGrallocMemory::displayBuffer(uint32_t index) mGetMemory(mPrivateHandle[dequeuedIdx]->fd, (size_t)mPrivateHandle[dequeuedIdx]->size, 1, - (void *)this); + mCallbackCookie); LOGH("idx = %d, fd = %d, size = %d, offset = %d", dequeuedIdx, mPrivateHandle[dequeuedIdx]->fd, mPrivateHandle[dequeuedIdx]->size, @@ -2010,7 +2011,7 @@ int32_t QCameraGrallocMemory::dequeueBuffer() mGetMemory(mPrivateHandle[dequeuedIdx]->fd, (size_t)mPrivateHandle[dequeuedIdx]->size, 1, - (void *)this); + mCallbackCookie); LOGH("idx = %d, fd = %d, size = %d, offset = %d", dequeuedIdx, mPrivateHandle[dequeuedIdx]->fd, mPrivateHandle[dequeuedIdx]->size, @@ -2201,7 +2202,7 @@ int QCameraGrallocMemory::allocate(uint8_t count, size_t /*size*/, mGetMemory(mPrivateHandle[cnt]->fd, (size_t)mPrivateHandle[cnt]->size, 1, - (void *)this); + mCallbackCookie); LOGH("idx = %d, fd = %d, size = %d, offset = %d", cnt, mPrivateHandle[cnt]->fd, mPrivateHandle[cnt]->size, diff --git a/camera/QCamera2/HAL/QCameraMem.h b/camera/QCamera2/HAL/QCameraMem.h index a20e29a..ec75e51 100644 --- a/camera/QCamera2/HAL/QCameraMem.h +++ b/camera/QCamera2/HAL/QCameraMem.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -192,6 +192,7 @@ public: class QCameraStreamMemory : public QCameraMemory { public: QCameraStreamMemory(camera_request_memory getMemory, + void* cbCookie, bool cached, QCameraMemoryPool *pool = NULL, cam_stream_type_t streamType = CAM_STREAM_TYPE_DEFAULT, @@ -210,13 +211,14 @@ public: protected: camera_request_memory mGetMemory; camera_memory_t *mCameraMemory[MM_CAMERA_MAX_NUM_FRAMES]; + void* mCallbackCookie; }; // Externel heap memory is used for memories shared with // framework. They are allocated from /dev/ion or gralloc. class QCameraVideoMemory : public QCameraStreamMemory { public: - QCameraVideoMemory(camera_request_memory getMemory, bool cached, + QCameraVideoMemory(camera_request_memory getMemory, void* cbCookie, bool cached, QCameraMemType bufType = QCAMERA_MEM_TYPE_DEFAULT); virtual ~QCameraVideoMemory(); @@ -248,7 +250,7 @@ class QCameraGrallocMemory : public QCameraMemory { BUFFER_OWNED, }; public: - QCameraGrallocMemory(camera_request_memory getMemory); + QCameraGrallocMemory(camera_request_memory getMemory, void* cbCookie); void setNativeWindow(preview_stream_ops_t *anw); virtual ~QCameraGrallocMemory(); @@ -282,6 +284,7 @@ private: preview_stream_ops_t *mWindow; int mWidth, mHeight, mFormat, mStride, mScanline, mUsage, mMaxFPS; camera_request_memory mGetMemory; + void* mCallbackCookie; camera_memory_t *mCameraMemory[MM_CAMERA_MAX_NUM_FRAMES]; int mMinUndequeuedBuffers; enum ColorSpace_t mColorSpace; -- cgit v1.2.3 From 09c713ce51870146bd67824de1111e96c1198541 Mon Sep 17 00:00:00 2001 From: Binhao Lin Date: Mon, 3 Apr 2017 14:09:33 -0700 Subject: msm8996-common: camera: HAL3: Return Error For Unsupported Stream Format Return error code -EINVAL instead of 0 when the stream format is unsupported Change-Id: If6aee12c68054243a90d655bbaf0e95c36887682 --- camera/QCamera2/HAL3/QCamera3HWI.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'camera') diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index 14d15a5..4e785f6 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -2111,7 +2111,8 @@ int QCamera3HardwareInterface::configureStreamsPerfLocked( default: LOGE("not a supported format 0x%x", newStream->format); - break; + pthread_mutex_unlock(&mMutex); + return -EINVAL; } } else if (newStream->stream_type == CAMERA3_STREAM_INPUT) { newStream->max_buffers = MAX_INFLIGHT_REPROCESS_REQUESTS; -- cgit v1.2.3 From 8b6e07b0d8f9ee71a4672cc94a3d607b42ad02fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Thu, 1 Mar 2018 22:35:14 +0100 Subject: msm8996-common: Don't build camera HAL test code. --- camera/QCamera2/stack/Android.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'camera') diff --git a/camera/QCamera2/stack/Android.mk b/camera/QCamera2/stack/Android.mk index a357417..bd1c3e6 100644 --- a/camera/QCamera2/stack/Android.mk +++ b/camera/QCamera2/stack/Android.mk @@ -1,5 +1,3 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/mm-camera-interface/Android.mk include $(LOCAL_PATH)/mm-jpeg-interface/Android.mk -include $(LOCAL_PATH)/mm-jpeg-interface/test/Android.mk -include $(LOCAL_PATH)/mm-camera-test/Android.mk -- cgit v1.2.3