From 87129b81d822e6a3d5c5ae58ccfa4e8626c89a55 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Tue, 22 Sep 2020 14:47:33 +0100 Subject: msm8996-common: camera: Drop usage of LOCAL_COPY_HEADERS Google deprecated LOCAL_COPY_HEADERS in Android 11, so use LOCAL_EXPORT_C_INCLUDE_DIRS instead. Ref: https://android.googlesource.com/platform/build/soong/+/master/docs/best_practices.md#headers. Change-Id: Id68bc83cf74f2af0037331ebe4d17819021b88e8 --- camera/QCamera2/Android.mk | 7 +++- camera/QCamera2/HAL3/QCameraFormat.h | 44 ++++++++++++++++++++++ .../QCamera2/stack/mm-camera-interface/Android.mk | 4 +- 3 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 camera/QCamera2/HAL3/QCameraFormat.h (limited to 'camera') diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 69b0e3e..8977469 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -73,7 +73,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../mm-image-codec/qexif \ $(LOCAL_PATH)/../mm-image-codec/qomx_core \ $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/stack/common \ $(LOCAL_PATH)/stack/mm-camera-interface/inc \ $(LOCAL_PATH)/util \ $(LOCAL_PATH)/HAL3 \ @@ -114,6 +113,7 @@ endif ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal endif +LOCAL_HEADER_LIBRARIES += camera_common_headers LOCAL_HEADER_LIBRARIES += media_plugin_headers LOCAL_HEADER_LIBRARIES += libandroid_sensor_headers LOCAL_HEADER_LIBRARIES += libcutils_headers @@ -131,5 +131,10 @@ LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_MODULE := camera_common_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/stack/common +include $(BUILD_HEADER_LIBRARY) + include $(call first-makefiles-under,$(LOCAL_PATH)) endif diff --git a/camera/QCamera2/HAL3/QCameraFormat.h b/camera/QCamera2/HAL3/QCameraFormat.h new file mode 100644 index 0000000..b3869b2 --- /dev/null +++ b/camera/QCamera2/HAL3/QCameraFormat.h @@ -0,0 +1,44 @@ +/* Copyright (c) 2016, 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 +* met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided +* with the distribution. +* * Neither the name of The Linux Foundation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + + +/* Macros exposed to gralloc to query camera HAL for gralloc format to be +used for vedor specific camera formats. */ + +#define PREFERRED_IMPLEMENTATION_DEFINED_CAMERA_FORMAT HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS +#define PREFERRED_YCBCR_420_888_CAMERA_FORMAT HAL_PIXEL_FORMAT_NV21_ZSL + +/* Macros exposed to camera HAL to get the preview and callback stream +formats. Please ensure that if the macros below are changed then the +corresponding change should be done in the above macros and vice versa +to prevent format mismatch between Gralloc and Camera HAL for stream +buffers */ + +#define PREVIEW_STREAM_FORMAT CAM_FORMAT_YUV_420_NV12_VENUS +#define CALLBACK_STREAM_FORMAT CAM_FORMAT_YUV_420_NV21 diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index f6e55a7..a77c319 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -27,9 +27,6 @@ ifneq (,$(filter msm8996 msmcobalt,$(TARGET_BOARD_PLATFORM))) endif LOCAL_CFLAGS += -D_ANDROID_ -DQCAMERA_REDEFINE_LOG -LOCAL_COPY_HEADERS_TO := mm-camera-interface -LOCAL_COPY_HEADERS += ../common/cam_intf.h -LOCAL_COPY_HEADERS += ../common/cam_types.h LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/inc \ @@ -52,6 +49,7 @@ LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog LOCAL_HEADER_LIBRARIES := libsystem_headers libhardware_headers +LOCAL_HEADER_LIBRARIES += camera_common_headers LOCAL_HEADER_LIBRARIES += media_plugin_headers LOCAL_HEADER_LIBRARIES += generated_kernel_headers LOCAL_MODULE_TAGS := optional -- cgit v1.2.3